oracle-ads 2.11.1__tar.gz → 2.11.2__tar.gz

{oracle_ads-2.11.1 → oracle_ads-2.11.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oracle_ads
-Version: 2.11.1
+Version: 2.11.2
 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.1 → oracle_ads-2.11.2}/THIRD_PARTY_LICENSES.txt

@@ -411,6 +411,13 @@ cachetools
 * Source code: https://github.com/tkem/cachetools/
 * Project home: https://cachetools.readthedocs.io/
 
+python-fire
+* Copyright 2017 Google Inc. All rights reserved.
+* License: Apache License 2.0
+* Source code: https://github.com/google/python-fire
+* Project home: https://github.com/google/python-fire
+
+=======
 =============================== Licenses ===============================
 ------------------------------------------------------------------------
 

{oracle_ads-2.11.1 → oracle_ads-2.11.2}/ads/aqua/base.py

@@ -17,7 +17,6 @@ from ads.aqua.utils import (
     UNKNOWN,
     _is_valid_mvs,
     get_artifact_path,
-    get_base_model_from_tags,
     is_valid_ocid,
     load_config,
     logger,

{oracle_ads-2.11.1 → oracle_ads-2.11.2}/ads/aqua/data.py

@@ -36,5 +36,7 @@ class Tags(Enum):
     AQUA_TAG = "OCI_AQUA"
     AQUA_SERVICE_MODEL_TAG = "aqua_service_model"
     AQUA_FINE_TUNED_MODEL_TAG = "aqua_fine_tuned_model"
+    AQUA_MODEL_NAME_TAG = "aqua_model_name"
     AQUA_EVALUATION = "aqua_evaluation"
     AQUA_FINE_TUNING = "aqua_finetuning"
+    READY_TO_FINE_TUNE = "ready_to_fine_tune"

{oracle_ads-2.11.1 → oracle_ads-2.11.2}/ads/aqua/deployment.py

@@ -61,6 +61,7 @@ class AquaDeployment(DataClassSerializable):
     id: str = None
     display_name: str = None
     aqua_service_model: bool = None
+    aqua_model_name: str = None
     state: str = None
     description: str = None
     created_on: str = None
@@ -116,13 +117,17 @@ class AquaDeployment(DataClassSerializable):
             ),
         )
 
+        freeform_tags = oci_model_deployment.freeform_tags or UNKNOWN_DICT
+        aqua_service_model_tag = freeform_tags.get(
+            Tags.AQUA_SERVICE_MODEL_TAG.value, None
+        )
+        aqua_model_name = freeform_tags.get(Tags.AQUA_MODEL_NAME_TAG.value, UNKNOWN)
+
         return AquaDeployment(
             id=oci_model_deployment.id,
             display_name=oci_model_deployment.display_name,
-            aqua_service_model=oci_model_deployment.freeform_tags.get(
-                Tags.AQUA_SERVICE_MODEL_TAG.value
-            )
-            is not None,
+            aqua_service_model=aqua_service_model_tag is not None,
+            aqua_model_name=aqua_model_name,
             shape_info=shape_info,
             state=oci_model_deployment.lifecycle_state,
             lifecycle_details=getattr(
@@ -137,7 +142,7 @@ class AquaDeployment(DataClassSerializable):
                 ocid=oci_model_deployment.id,
                 region=region,
             ),
-            tags=oci_model_deployment.freeform_tags,
+            tags=freeform_tags,
         )
 
 
@@ -235,17 +240,9 @@ class AquaDeploymentApp(AquaApp):
             An Aqua deployment instance
 
         """
-        # todo: revisit error handling and pull deployment image info from config
-        # if not AQUA_MODEL_DEPLOYMENT_IMAGE:
-        #     raise AquaValueError(
-        #         f"AQUA_MODEL_DEPLOYMENT_IMAGE must be available in environment variables to "
-        #         f"continue with Aqua model deployment."
-        #     )
-
-        # todo: for fine tuned models, skip model creation.
         # Create a model catalog entry in the user compartment
         aqua_model = AquaModelApp().create(
-            model_id=model_id, comparment_id=compartment_id, project_id=project_id
+            model_id=model_id, compartment_id=compartment_id, project_id=project_id
         )
 
         tags = {}
@@ -257,6 +254,8 @@ class AquaDeploymentApp(AquaApp):
             if tag in aqua_model.freeform_tags:
                 tags[tag] = aqua_model.freeform_tags[tag]
 
+        tags.update({Tags.AQUA_MODEL_NAME_TAG.value: aqua_model.display_name})
+
         # Set up info to get deployment config
         config_source_id = model_id
         model_name = aqua_model.display_name
@@ -535,7 +534,7 @@ class AquaDeploymentApp(AquaApp):
             log_group_id=log_group_id,
             log_id=log_id,
             compartment_id=model_deployment.compartment_id,
-            source_id=model_deployment.id
+            source_id=model_deployment.id,
         )
 
         return AquaDeploymentDetail(

{oracle_ads-2.11.1 → oracle_ads-2.11.2}/ads/aqua/evaluation.py

@@ -362,7 +362,7 @@ class AquaEvaluationApp(AquaApp):
     @telemetry(entry_point="plugin=evaluation&action=create", name="aqua")
     def create(
         self,
-        create_aqua_evaluation_details: CreateAquaEvaluationDetails,
+        create_aqua_evaluation_details: CreateAquaEvaluationDetails = None,
         **kwargs,
     ) -> "AquaEvaluationSummary":
         """Creates Aqua evaluation for resource.
@@ -373,13 +373,23 @@ class AquaEvaluationApp(AquaApp):
             The CreateAquaEvaluationDetails data class which contains all
             required and optional fields to create the aqua evaluation.
         kwargs:
-            The kwargs for the evaluation.
+            The kwargs for creating CreateAquaEvaluationDetails instance if
+            no create_aqua_evaluation_details provided.
 
         Returns
         -------
         AquaEvaluationSummary:
             The instance of AquaEvaluationSummary.
         """
+        if not create_aqua_evaluation_details:
+            try:
+                create_aqua_evaluation_details = CreateAquaEvaluationDetails(**kwargs)
+            except:
+                raise AquaValueError(
+                    "Invalid create evaluation parameters. Allowable parameters are: "
+                    f"{', '.join(list(asdict(CreateAquaEvaluationDetails).keys()))}."
+                )
+
         if not is_valid_ocid(create_aqua_evaluation_details.evaluation_source_id):
             raise AquaValueError(
                 f"Invalid evaluation source {create_aqua_evaluation_details.evaluation_source_id}. "
@@ -1066,7 +1076,7 @@ class AquaEvaluationApp(AquaApp):
             {
                 "use_case": ["text_generation"],
                 "key": "bertscore",
-                "name": "BERT Score",
+                "name": "bertscore",
                 "description": (
                     "BERT Score is a metric for evaluating the quality of text "
                     "generation models, such as machine translation or summarization. "
@@ -1079,7 +1089,7 @@ class AquaEvaluationApp(AquaApp):
             {
                 "use_case": ["text_generation"],
                 "key": "rouge",
-                "name": "ROUGE Score",
+                "name": "rouge",
                 "description": (
                     "ROUGE scores compare a candidate document to a collection of "
                     "reference documents to evaluate the similarity between them. "
@@ -1363,40 +1373,35 @@ class AquaEvaluationApp(AquaApp):
             },
             "shape": {
                 "VM.Standard.E3.Flex": {
-                    "ocpu": 2,
-                    "memory_in_gbs": 64,
-                    "block_storage_size": 100,
-                },
-                "VM.Standard.E3.Flex": {
-                    "ocpu": 2,
-                    "memory_in_gbs": 64,
-                    "block_storage_size": 100,
+                    "ocpu": 8,
+                    "memory_in_gbs": 128,
+                    "block_storage_size": 200,
                 },
                 "VM.Standard.E4.Flex": {
-                    "ocpu": 2,
-                    "memory_in_gbs": 64,
-                    "block_storage_size": 100,
+                    "ocpu": 8,
+                    "memory_in_gbs": 128,
+                    "block_storage_size": 200,
                 },
                 "VM.Standard3.Flex": {
-                    "ocpu": 2,
-                    "memory_in_gbs": 64,
-                    "block_storage_size": 100,
+                    "ocpu": 8,
+                    "memory_in_gbs": 128,
+                    "block_storage_size": 200,
                 },
                 "VM.Optimized3.Flex": {
-                    "ocpu": 2,
-                    "memory_in_gbs": 64,
-                    "block_storage_size": 100,
+                    "ocpu": 8,
+                    "memory_in_gbs": 128,
+                    "block_storage_size": 200,
                 },
                 "VM.Standard.A1.Flex": {
-                    "ocpu": 2,
-                    "memory_in_gbs": 64,
-                    "block_storage_size": 100,
+                    "ocpu": 8,
+                    "memory_in_gbs": 128,
+                    "block_storage_size": 200,
                 },
             },
             "default": {
-                "ocpu": 2,
-                "memory_in_gbs": 64,
-                "block_storage_size": 100,
+                "ocpu": 8,
+                "memory_in_gbs": 128,
+                "block_storage_size": 200,
             },
         }
 

{oracle_ads-2.11.1 → oracle_ads-2.11.2}/ads/aqua/finetune.py

@@ -24,12 +24,10 @@ from ads.aqua.utils import (
     DEFAULT_FT_BLOCK_STORAGE_SIZE,
     DEFAULT_FT_REPLICA,
     DEFAULT_FT_VALIDATION_SET_SIZE,
-    FINE_TUNING_RUNTIME_CONTAINER,
     JOB_INFRASTRUCTURE_TYPE_DEFAULT_NETWORKING,
     UNKNOWN,
     UNKNOWN_DICT,
     get_container_image,
-    load_config,
     logger,
     upload_local_to_os,
 )
@@ -433,6 +431,11 @@ class AquaFineTuningApp(AquaApp):
             for metadata in ft_model_custom_metadata.to_dict()["data"]
         ]
 
+        source_freeform_tags = source.freeform_tags or {}
+        source_freeform_tags.pop(Tags.LICENSE.value, None)
+        source_freeform_tags.update({Tags.READY_TO_FINE_TUNE.value: "false"})
+        source_freeform_tags.update({Tags.AQUA_TAG.value: UNKNOWN})
+
         self.update_model(
             model_id=ft_model.id,
             update_model_details=UpdateModelDetails(
@@ -441,7 +444,7 @@ class AquaFineTuningApp(AquaApp):
                     Tags.AQUA_FINE_TUNED_MODEL_TAG.value: (
                         f"{source.id}#{source.display_name}"
                     ),
-                    **source.freeform_tags,
+                    **source_freeform_tags,
                 },
             ),
         )

{oracle_ads-2.11.1 → oracle_ads-2.11.2}/ads/aqua/model.py

@@ -2,11 +2,11 @@
 # -*- 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 re
 from dataclasses import InitVar, dataclass, field
 from datetime import datetime, timedelta
 from enum import Enum
-import os
 from threading import Lock
 from typing import List, Union
 
@@ -25,18 +25,19 @@ from ads.aqua.constants import (
     FineTuningDefinedMetadata,
 )
 from ads.aqua.data import AquaResourceIdentifier, Tags
-
 from ads.aqua.exception import AquaRuntimeError
+
+from ads.aqua.training.exceptions import exit_code_dict
 from ads.aqua.utils import (
     LICENSE_TXT,
     README,
     READY_TO_DEPLOY_STATUS,
+    READY_TO_FINE_TUNE_STATUS,
     UNKNOWN,
     create_word_icon,
     get_artifact_path,
     read_file,
 )
-from ads.aqua.training.exceptions import exit_code_dict
 from ads.common.auth import default_signer
 from ads.common.object_storage_details import ObjectStorageDetails
 from ads.common.oci_resource import SEARCH_TYPE, OCIResource
@@ -45,10 +46,10 @@ from ads.common.utils import get_console_link, get_log_links
 from ads.config import (
     AQUA_SERVICE_MODELS_BUCKET,
     COMPARTMENT_OCID,
+    CONDA_BUCKET_NS,
     ODSC_MODEL_COMPARTMENT_OCID,
     PROJECT_OCID,
     TENANCY_OCID,
-    CONDA_BUCKET_NS,
 )
 from ads.model import DataScienceModel
 from ads.model.model_metadata import MetadataTaxonomyKeys, ModelCustomMetadata
@@ -106,6 +107,7 @@ class AquaModelSummary(DataClassSerializable):
     console_link: str = None
     search_text: str = None
     ready_to_deploy: bool = True
+    ready_to_finetune: bool = False
 
 
 @dataclass(repr=False)
@@ -626,8 +628,10 @@ class AquaModelApp(AquaApp):
         is_fine_tuned_model = Tags.AQUA_FINE_TUNED_MODEL_TAG.value in freeform_tags
         ready_to_deploy = (
             freeform_tags.get(Tags.AQUA_TAG.value, "").upper() == READY_TO_DEPLOY_STATUS
-            if is_fine_tuned_model
-            else True
+        )
+        ready_to_finetune = (
+            freeform_tags.get(Tags.READY_TO_FINE_TUNE.value, "").upper()
+            == READY_TO_FINE_TUNE_STATUS
         )
 
         return dict(
@@ -644,6 +648,7 @@ class AquaModelApp(AquaApp):
             console_link=console_link,
             search_text=search_text,
             ready_to_deploy=ready_to_deploy,
+            ready_to_finetune=ready_to_finetune,
         )
 
     @telemetry(entry_point="plugin=model&action=list", name="aqua")

{oracle_ads-2.11.1 → oracle_ads-2.11.2}/ads/aqua/training/exceptions.py

@@ -66,6 +66,16 @@ class TrainingExit(SystemExit):
             traceback.print_exc()
 
 
+class TrustRemoteCodeErrorExit(TrainingExit):
+    """Error when the model contains custom code while `trust_remote_code` is not set to True."""
+
+    code = 30
+    reason = (
+        "The model contains custom code which must be executed in order to correctly load the model."
+        "However, `trust_remote_code` is not enabled."
+    )
+
+
 class DistributedTrainingLoggingError(TrainingExit):
     """Error when fetching job run logs for setting up distributed training."""
 
@@ -349,7 +359,7 @@ class ObjectStorageErrorExit(ServiceErrorExit):
     target_service = "object_storage"
     reason = (
         "Failed to access object storage service. "
-        "Please make sure the job run has permission to access the object stroage."
+        "Please make sure the job run has permission to access the object storage."
     )
 
 
@@ -364,7 +374,7 @@ class OutOfMemoryErrorExit(TrainingExit):
     )
 
 
-class NetworkTimeoutError(TrainingExit):
+class NetworkTimeoutErrorExit(TrainingExit):
     """Error due to network connection timeout."""
 
     code = 101
@@ -372,10 +382,17 @@ class NetworkTimeoutError(TrainingExit):
         "Network connection timeout. "
         "If you are using custom networking, "
         "please check the VCN/subnet setting to make sure service or NAT gateway is configured correctly. "
-        "This could also be a temperoary issue."
+        "This could also be a temporary issue."
     )
 
 
+class GPUNotAvailableErrorExit(TrainingExit):
+    """Error when GPU is not available."""
+
+    code = 102
+    reason = "GPU is not available."
+
+
 def exception_list():
     """Returns a list of exceptions that may cause the training to exit with specific code."""
     return [
@@ -437,14 +454,13 @@ def service_dict():
     }
 
 
-def log_reason_and_raise(exception_cause: BaseException, exit_ex: TrainingExit = None):
+def log_reason_and_print_exc(exit_ex: TrainingExit = None):
     """Log the exit reason and raise a TrainingExit exception to exit with exit code."""
     logger.error(traceback.format_exc())
     logger.critical(exit_ex.reason)
-    raise exit_ex from exception_cause
 
 
-def raise_service_exit(ex: oci.exceptions.ServiceError):
+def prepare_service_exit(ex: oci.exceptions.ServiceError):
     """Raise ServiceErrorExit base on OCI ServiceError."""
     operations = operation_dict()
     services = service_dict()
@@ -456,4 +472,5 @@ def raise_service_exit(ex: oci.exceptions.ServiceError):
         exit_ex = ServiceErrorExit(
             service=ex.target_service, operation=ex.operation_name
         )
-    log_reason_and_raise(exception_cause=ex, exit_ex=exit_ex)
+    log_reason_and_print_exc(exit_ex=exit_ex)
+    return exit_ex

{oracle_ads-2.11.1 → oracle_ads-2.11.2}/ads/aqua/ui.py

@@ -406,7 +406,7 @@ class AquaUIApp(AquaApp):
             ).data
         except ServiceError as se:
             raise AquaResourceAccessError(
-                f"Could not check limits availability for the shape {instance_shape}.",
+                f"Could not check limits availability for the shape {instance_shape}. Make sure you have the necessary policy to check limits availability.",
                 service_payload=se.args[0] if se.args else None,
             )
 

{oracle_ads-2.11.1 → oracle_ads-2.11.2}/ads/aqua/utils.py

@@ -31,8 +31,8 @@ from ads.common.utils import get_console_link, upload_to_os
 from ads.config import (
     AQUA_CONFIG_FOLDER,
     AQUA_SERVICE_MODELS_BUCKET,
-    TENANCY_OCID,
     CONDA_BUCKET_NS,
+    TENANCY_OCID,
 )
 from ads.model import DataScienceModel, ModelVersionSet
 
@@ -67,7 +67,7 @@ CONSOLE_LINK_RESOURCE_TYPE_MAPPING = dict(
     datasciencemodelversionsetdev="model-version-sets",
 )
 FINE_TUNING_RUNTIME_CONTAINER = "iad.ocir.io/ociodscdev/aqua_ft_cuda121:0.3.17.20"
-DEFAULT_FT_BLOCK_STORAGE_SIZE = 256
+DEFAULT_FT_BLOCK_STORAGE_SIZE = 750
 DEFAULT_FT_REPLICA = 1
 DEFAULT_FT_BATCH_SIZE = 1
 DEFAULT_FT_VALIDATION_SET_SIZE = 0.1
@@ -78,6 +78,7 @@ JOB_INFRASTRUCTURE_TYPE_DEFAULT_NETWORKING = "ME_STANDALONE"
 NB_SESSION_IDENTIFIER = "NB_SESSION_OCID"
 LIFECYCLE_DETAILS_MISSING_JOBRUN = "The asscociated JobRun resource has been deleted."
 READY_TO_DEPLOY_STATUS = "ACTIVE"
+READY_TO_FINE_TUNE_STATUS = "TRUE"
 
 
 class LifecycleStatus(Enum):
@@ -610,18 +611,18 @@ def fire_and_forget(func):
     return wrapped
 
 
-def get_base_model_from_tags(tags):
-    base_model_ocid = ""
-    base_model_name = ""
-    if Tags.AQUA_FINE_TUNED_MODEL_TAG.value in tags:
-        tag = tags[Tags.AQUA_FINE_TUNED_MODEL_TAG.value]
-        if "#" in tag:
-            base_model_ocid, base_model_name = tag.split("#")
+def extract_id_and_name_from_tag(tag: str):
+    base_model_ocid = UNKNOWN
+    base_model_name = UNKNOWN
+    try:
+        base_model_ocid, base_model_name = tag.split("#")
+    except:
+        pass
 
-        if not (is_valid_ocid(base_model_ocid) and base_model_name):
-            raise AquaValueError(
-                f"{Tags.AQUA_FINE_TUNED_MODEL_TAG.value} tag should have the format `Service Model OCID#Model Name`."
-            )
+    if not (is_valid_ocid(base_model_ocid) and base_model_name):
+        logger.debug(
+            f"Invalid {tag}. Specify tag in the format as <service_model_id>#<service_model_name>."
+        )
 
     return base_model_ocid, base_model_name
 

{oracle_ads-2.11.1 → oracle_ads-2.11.2}/ads/config.py

@@ -8,7 +8,6 @@ import contextlib
 import inspect
 import os
 from typing import Dict, Optional
-
 from ads.common.config import DEFAULT_CONFIG_PATH, DEFAULT_CONFIG_PROFILE, Config, Mode
 
 OCI_ODSC_SERVICE_ENDPOINT = os.environ.get("OCI_ODSC_SERVICE_ENDPOINT")
@@ -49,8 +48,6 @@ RESOURCE_OCID = (
 NO_CONTAINER = os.environ.get("NO_CONTAINER")
 TMPDIR = os.environ.get("TMPDIR")
 
-ODSC_MODEL_COMPARTMENT_OCID = os.environ.get("ODSC_MODEL_COMPARTMENT_OCID")
-AQUA_MODEL_DEPLOYMENT_IMAGE = os.environ.get("AQUA_MODEL_DEPLOYMENT_IMAGE")
 AQUA_MODEL_DEPLOYMENT_CONFIG = os.environ.get(
     "AQUA_DEPLOYMENT_CONFIG", "deployment_config.json"
 )
@@ -86,6 +83,17 @@ 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.1 → oracle_ads-2.11.2}/ads/model/datascience_model.py

@@ -18,7 +18,11 @@ from jsonschema import ValidationError, validate
 
 from ads.common import utils
 from ads.common.object_storage_details import ObjectStorageDetails
-from ads.config import COMPARTMENT_OCID, PROJECT_OCID
+from ads.config import (
+    COMPARTMENT_OCID,
+    PROJECT_OCID,
+    AQUA_SERVICE_MODELS_BUCKET as SERVICE_MODELS_BUCKET,
+)
 from ads.feature_engineering.schema import Schema
 from ads.jobs.builders.base import Builder
 from ads.model.artifact_downloader import (
@@ -1316,7 +1320,11 @@ class DataScienceModel(Builder):
                 bucket_uri = [bucket_uri]
 
             for uri in bucket_uri:
-                if not ObjectStorageDetails.from_path(uri).is_bucket_versioned():
+                os_path = ObjectStorageDetails.from_path(uri)
+                # for aqua use case, user may not have access to the service bucket.
+                if os_path.bucket == SERVICE_MODELS_BUCKET:
+                    continue
+                if not os_path.is_bucket_versioned():
                     message = f"Model artifact bucket {uri} is not versioned. Enable versioning on the bucket to proceed with model creation by reference."
                     logger.error(message)
                     raise BucketNotVersionedError(message)

{oracle_ads-2.11.1 → oracle_ads-2.11.2}/pyproject.toml

@@ -21,7 +21,7 @@ build-backend = "flit_core.buildapi"
 
 # Required
 name = "oracle_ads" # the install (PyPI) name; name for local build in [tool.flit.module] section below
-version = "2.11.1"
+version = "2.11.2"
 
 # Optional
 description = "Oracle Accelerated Data Science SDK"