oracle-ads 2.11.10__tar.gz → 2.11.12__tar.gz

{oracle_ads-2.11.10 → oracle_ads-2.11.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oracle_ads
-Version: 2.11.10
+Version: 2.11.12
 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.10 → oracle_ads-2.11.12}/ads/aqua/app.py

@@ -303,7 +303,15 @@ class AquaApp:
                 config_file_name=config_file_name,
             )
         except:
-            pass
+            # todo: temp fix for issue related to config load for byom models, update logic to choose the right path
+            try:
+                config_path = f"{artifact_path.rstrip('/')}/config/"
+                config = load_config(
+                    config_path,
+                    config_file_name=config_file_name,
+                )
+            except:
+                pass
 
         if not config:
             logger.error(

{oracle_ads-2.11.10 → oracle_ads-2.11.12}/ads/aqua/common/utils.py

@@ -28,10 +28,11 @@ from ads.aqua.common.errors import (
 from ads.aqua.constants import *
 from ads.aqua.data import AquaResourceIdentifier
 from ads.common.auth import default_signer
+from ads.common.decorator.threaded import threaded
 from ads.common.extended_enum import ExtendedEnumMeta
 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, copy_file
+from ads.common.utils import copy_file, get_console_link, upload_to_os
 from ads.config import AQUA_SERVICE_MODELS_BUCKET, CONDA_BUCKET_NS, TENANCY_OCID
 from ads.model import DataScienceModel, ModelVersionSet
 
@@ -195,6 +196,7 @@ def read_file(file_path: str, **kwargs) -> str:
         return UNKNOWN
 
 
+@threaded()
 def load_config(file_path: str, config_file_name: str, **kwargs) -> dict:
     artifact_path = f"{file_path.rstrip('/')}/{config_file_name}"
     if artifact_path.startswith("oci://"):
@@ -540,8 +542,10 @@ def get_container_image(
 
 
 def fetch_service_compartment() -> Union[str, None]:
-    """Loads the compartment mapping json from service bucket. This json file has a service-model-compartment key which
-    contains a dictionary of namespaces and the compartment OCID of the service models in that namespace.
+    """
+    Loads the compartment mapping json from service bucket.
+    This json file has a service-model-compartment key which contains a dictionary of namespaces
+    and the compartment OCID of the service models in that namespace.
     """
     config_file_name = (
         f"oci://{AQUA_SERVICE_MODELS_BUCKET}@{CONDA_BUCKET_NS}/service_models/config"
@@ -554,8 +558,8 @@ def fetch_service_compartment() -> Union[str, None]:
         )
     except Exception as e:
         logger.debug(
-            f"Config file {config_file_name}/{CONTAINER_INDEX} to fetch service compartment OCID could not be found. "
-            f"\n{str(e)}."
+            f"Config file {config_file_name}/{CONTAINER_INDEX} to fetch service compartment OCID "
+            f"could not be found. \n{str(e)}."
         )
         return
     compartment_mapping = config.get(COMPARTMENT_MAPPING_KEY)
@@ -664,23 +668,26 @@ def get_model_by_reference_paths(model_file_description: dict):
     fine_tune_output_path = UNKNOWN
     models = model_file_description["models"]
 
-    for model in models:
-        namespace, bucket_name, prefix = (
-            model["namespace"],
-            model["bucketName"],
-            model["prefix"],
+    if not models:
+        raise AquaValueError(
+            f"Model path is not available in the model json artifact. "
+            f"Please check if the model created by reference has the correct artifact."
         )
-        bucket_uri = f"oci://{bucket_name}@{namespace}/{prefix}".rstrip("/")
-        if bucket_name == AQUA_SERVICE_MODELS_BUCKET:
-            base_model_path = bucket_uri
-        else:
-            fine_tune_output_path = bucket_uri
 
-    if not base_model_path:
-        raise AquaValueError(
-            f"Base Model should come from the bucket {AQUA_SERVICE_MODELS_BUCKET}. "
-            f"Other paths are not supported by Aqua."
+    if len(models) > 0:
+        # since the model_file_description json does not have a flag to identify the base model, we consider
+        # the first instance to be the base model.
+        base_model_artifact = models[0]
+        base_model_path = f"oci://{base_model_artifact['bucketName']}@{base_model_artifact['namespace']}/{base_model_artifact['prefix']}".rstrip(
+            "/"
+        )
+    if len(models) > 1:
+        # second model is considered as fine-tuned model
+        ft_model_artifact = models[1]
+        fine_tune_output_path = f"oci://{ft_model_artifact['bucketName']}@{ft_model_artifact['namespace']}/{ft_model_artifact['prefix']}".rstrip(
+            "/"
         )
+
     return base_model_path, fine_tune_output_path
 
 

{oracle_ads-2.11.10 → oracle_ads-2.11.12}/ads/aqua/finetuning/finetuning.py

@@ -109,11 +109,13 @@ class AquaFineTuningApp(AquaApp):
                 )
 
         source = self.get_source(create_fine_tuning_details.ft_source_id)
-        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."
-            )
+
+        # todo: revisit validation for fine tuned models
+        # 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
@@ -364,6 +366,7 @@ class AquaFineTuningApp(AquaApp):
         source_freeform_tags.pop(Tags.LICENSE, None)
         source_freeform_tags.update({Tags.READY_TO_FINE_TUNE: "false"})
         source_freeform_tags.update({Tags.AQUA_TAG: UNKNOWN})
+        source_freeform_tags.pop(Tags.BASE_MODEL_CUSTOM, None)
 
         self.update_model(
             model_id=ft_model.id,

{oracle_ads-2.11.10 → oracle_ads-2.11.12}/ads/aqua/model/model.py

@@ -648,15 +648,19 @@ class AquaModelApp(AquaApp):
             copy_model_config(
                 artifact_path=artifact_path, os_path=os_path, auth=default_signer()
             )
-
         except:
-            # Add artifact from user bucket
-            metadata.add(
-                key=MODEL_BY_REFERENCE_OSS_PATH_KEY,
-                value=os_path,
-                description="artifact location",
-                category="Other",
+            logger.debug(
+                f"Proceeding with model registration without copying model config files at {os_path}. "
+                f"Default configuration will be used for deployment and fine-tuning."
             )
+        # Set artifact location to user bucket, and replace existing key if present.
+        metadata.add(
+            key=MODEL_BY_REFERENCE_OSS_PATH_KEY,
+            value=os_path,
+            description="artifact location",
+            category="Other",
+            replace=True,
+        )
 
         model = (
             model.with_custom_metadata_list(metadata)

oracle_ads-2.11.12/ads/common/decorator/threaded.py

@@ -0,0 +1,97 @@
+#!/usr/bin/env python
+# -*- coding: utf-8; -*-
+
+# Copyright (c) 2021, 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 concurrent.futures
+import functools
+import logging
+from typing import Optional
+
+from git import Optional
+
+from ads.config import THREADED_DEFAULT_TIMEOUT
+
+logger = logging.getLogger(__name__)
+
+# Create a global thread pool with a maximum of 10 threads
+thread_pool = concurrent.futures.ThreadPoolExecutor(max_workers=10)
+
+
+class TimeoutError(Exception):
+    """
+    Custom exception to be raised when a function times out.
+
+    Attributes
+    ----------
+    message : str
+        The error message describing what went wrong.
+
+    Parameters
+    ----------
+    message : str
+        The error message.
+    """
+
+    def __init__(
+        self,
+        func_name: str,
+        timeout: int,
+        message: Optional[str] = "The operation could not be completed in time.",
+    ):
+        super().__init__(
+            f"{message} The function '{func_name}' exceeded the timeout of {timeout} seconds."
+        )
+
+
+def threaded(timeout: Optional[int] = THREADED_DEFAULT_TIMEOUT):
+    """
+    Decorator to run a function in a separate thread using a global thread pool.
+
+    Parameters
+    ----------
+    timeout (int, optional)
+        The maximum time in seconds to wait for the function to complete.
+        If the function does not complete within this time, "timeout" is returned.
+
+    Returns
+    -------
+    function: The wrapped function that will run in a separate thread with the specified timeout.
+    """
+
+    def decorator(func):
+        @functools.wraps(func)
+        def wrapper(*args, **kwargs):
+            """
+            Wrapper function to submit the decorated function to the thread pool and handle timeout.
+
+            Parameters
+            ----------
+                *args: Positional arguments to pass to the decorated function.
+                **kwargs: Keyword arguments to pass to the decorated function.
+
+            Returns
+            -------
+            Any: The result of the decorated function if it completes within the timeout.
+
+            Raise
+            -----
+            TimeoutError
+                In case of the function exceeded the timeout.
+            """
+            future = thread_pool.submit(func, *args, **kwargs)
+            try:
+                return future.result(timeout=timeout)
+            except concurrent.futures.TimeoutError as ex:
+                logger.debug(
+                    f"The function '{func.__name__}' "
+                    f"exceeded the timeout of {timeout} seconds. "
+                    f"{ex}"
+                )
+                raise TimeoutError(func.__name__, timeout)
+
+        return wrapper
+
+    return decorator

{oracle_ads-2.11.10 → oracle_ads-2.11.12}/ads/config.py

@@ -8,6 +8,7 @@ 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")
@@ -86,6 +87,15 @@ AQUA_SERVICE_NAME = "aqua"
 DATA_SCIENCE_SERVICE_NAME = "data-science"
 
 
+THREADED_DEFAULT_TIMEOUT = 5
+try:
+    THREADED_DEFAULT_TIMEOUT = int(
+        os.environ.get("THREADED_DEFAULT_TIMEOUT", THREADED_DEFAULT_TIMEOUT)
+    )
+except ValueError:
+    pass
+
+
 def export(
     uri: Optional[str] = DEFAULT_CONFIG_PATH,
     auth: Dict = None,

{oracle_ads-2.11.10 → oracle_ads-2.11.12}/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.10"
+version = "2.11.12"
 
 # Optional
 description = "Oracle Accelerated Data Science SDK"