ADS release v2.11.2 (#738)

Author: liudmylaru

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 ===============================
 ------------------------------------------------------------------------
 

ads/aqua/base.py

@@ -17,7 +17,6 @@
     UNKNOWN,
     _is_valid_mvs,
     get_artifact_path,
-    get_base_model_from_tags,
     is_valid_ocid,
     load_config,
     logger,

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"

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 @@ def from_oci_model_deployment(
             ),
         )
 
+        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 @@ def from_oci_model_deployment(
                 ocid=oci_model_deployment.id,
                 region=region,
             ),
-            tags=oci_model_deployment.freeform_tags,
+            tags=freeform_tags,
         )
 
 
@@ -235,17 +240,9 @@ def create(
             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 @@ def create(
             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 @@ def get(self, model_deployment_id: str, **kwargs) -> "AquaDeploymentDetail":
             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(

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 @@ def create(
             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 @@ def get_supported_metrics(self) -> dict:
             {
                 "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 @@ def get_supported_metrics(self) -> dict:
             {
                 "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 @@ def load_evaluation_config(self, eval_id):
             },
             "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,
             },
         }
 

ads/aqua/finetune.py

@@ -24,12 +24,10 @@
     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 @@ def create(
             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 @@ def create(
                     Tags.AQUA_FINE_TUNED_MODEL_TAG.value: (
                         f"{source.id}#{source.display_name}"
                     ),
-                    **source.freeform_tags,
+                    **source_freeform_tags,
                 },
             ),
         )

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 @@
     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.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 @@ def _process_model(
         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 @@ def _process_model(
             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")