oracle-ads 2.11.7__py3-none-any.whl → 2.11.8__py3-none-any.whl

ads/aqua/extension/base_handler.py

@@ -8,14 +8,16 @@ import json
 import traceback
 import uuid
 from dataclasses import asdict, is_dataclass
+from http.client import responses
 from typing import Any
 
 from notebook.base.handlers import APIHandler
-from tornado.web import HTTPError, Application
 from tornado import httputil
-from ads.telemetry.client import TelemetryClient
-from ads.config import AQUA_TELEMETRY_BUCKET, AQUA_TELEMETRY_BUCKET_NS
+from tornado.web import Application, HTTPError
+
 from ads.aqua import logger
+from ads.config import AQUA_TELEMETRY_BUCKET, AQUA_TELEMETRY_BUCKET_NS
+from ads.telemetry.client import TelemetryClient
 
 
 class AquaAPIhandler(APIHandler):
@@ -66,12 +68,15 @@ class AquaAPIhandler(APIHandler):
 
     def write_error(self, status_code, **kwargs):
         """AquaAPIhandler errors are JSON, not human pages."""
-
         self.set_header("Content-Type", "application/json")
         reason = kwargs.get("reason")
         self.set_status(status_code, reason=reason)
         service_payload = kwargs.get("service_payload", {})
-        message = self.get_default_error_messages(service_payload, str(status_code))
+        default_msg = responses.get(status_code, "Unknown HTTP Error")
+        message = self.get_default_error_messages(
+            service_payload, str(status_code), kwargs.get("message", default_msg)
+        )
+
         reply = {
             "status": status_code,
             "message": message,
@@ -84,7 +89,7 @@ class AquaAPIhandler(APIHandler):
             e = exc_info[1]
             if isinstance(e, HTTPError):
                 reply["message"] = e.log_message or message
-                reply["reason"] = e.reason
+                reply["reason"] = e.reason if e.reason else reply["reason"]
                 reply["request_id"] = str(uuid.uuid4())
             else:
                 reply["request_id"] = str(uuid.uuid4())
@@ -102,7 +107,11 @@ class AquaAPIhandler(APIHandler):
         self.finish(json.dumps(reply))
 
     @staticmethod
-    def get_default_error_messages(service_payload: dict, status_code: str):
+    def get_default_error_messages(
+        service_payload: dict,
+        status_code: str,
+        default_msg: str = "Unknown HTTP Error.",
+    ):
         """Method that maps the error messages based on the operation performed or the status codes encountered."""
 
         messages = {
@@ -110,7 +119,6 @@ class AquaAPIhandler(APIHandler):
             "403": "We're having trouble processing your request with the information provided.",
             "404": "Authorization Failed: The resource you're looking for isn't accessible.",
             "408": "Server is taking too long to response, please try again.",
-            "500": "An error occurred while creating the resource.",
             "create": "Authorization Failed: Could not create resource.",
             "get": "Authorization Failed: The resource you're looking for isn't accessible.",
         }
@@ -119,7 +127,7 @@ class AquaAPIhandler(APIHandler):
             operation_name = service_payload["operation_name"]
             if operation_name:
                 if operation_name.startswith("create"):
-                    return messages["create"]
+                    return messages["create"] + f" Operation Name: {operation_name}."
                 elif operation_name.startswith("list") or operation_name.startswith(
                     "get"
                 ):
@@ -128,7 +136,7 @@ class AquaAPIhandler(APIHandler):
         if status_code in messages:
             return messages[status_code]
         else:
-            return "Unknown HTTP Error."
+            return default_msg
 
 
 # todo: remove after error handler is implemented

ads/aqua/extension/common_handler.py

@@ -6,14 +6,17 @@
 
 from importlib import metadata
 
-from ads.aqua.extension.base_handler import AquaAPIhandler
 from ads.aqua import ODSC_MODEL_COMPARTMENT_OCID
+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, fetch_service_compartment
 
 
 class ADSVersionHandler(AquaAPIhandler):
     """The handler to get the current version of the ADS."""
 
+    @handle_exceptions
     def get(self):
         self.finish({"data": metadata.version("oracle_ads")})
 
@@ -21,9 +24,25 @@ class ADSVersionHandler(AquaAPIhandler):
 class CompatibilityCheckHandler(AquaAPIhandler):
     """The handler to check if the extension is compatible."""
 
+    @handle_exceptions
     def get(self):
-        if ODSC_MODEL_COMPARTMENT_OCID:
+        """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 or fetch_service_compartment():
             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/extension/deployment_handler.py

@@ -7,10 +7,10 @@ from urllib.parse import urlparse
 
 from tornado.web import HTTPError
 
+from ads.aqua.decorator import handle_exceptions
 from ads.aqua.deployment import AquaDeploymentApp, MDInferenceResponse, ModelParams
 from ads.aqua.extension.base_handler import AquaAPIhandler, Errors
 from ads.config import COMPARTMENT_OCID, PROJECT_OCID
-from ads.aqua.decorator import handle_exceptions
 
 
 class AquaDeploymentHandler(AquaAPIhandler):
@@ -110,12 +110,10 @@ class AquaDeploymentHandler(AquaAPIhandler):
             )
         )
 
-    @handle_exceptions
     def read(self, id):
         """Read the information of an Aqua model deployment."""
         return self.finish(AquaDeploymentApp().get(model_deployment_id=id))
 
-    @handle_exceptions
     def list(self):
         """List Aqua models."""
         # If default is not specified,
@@ -129,7 +127,6 @@ class AquaDeploymentHandler(AquaAPIhandler):
             )
         )
 
-    @handle_exceptions
     def get_deployment_config(self, model_id):
         """Gets the deployment config for Aqua model."""
         return self.finish(AquaDeploymentApp().get_deployment_config(model_id=model_id))

ads/aqua/extension/evaluation_handler.py

@@ -5,11 +5,10 @@
 
 from urllib.parse import urlparse
 
-from requests import HTTPError
+from tornado.web import HTTPError
 
 from ads.aqua.decorator import handle_exceptions
 from ads.aqua.evaluation import AquaEvaluationApp, CreateAquaEvaluationDetails
-from ads.aqua.exception import AquaError
 from ads.aqua.extension.base_handler import AquaAPIhandler, Errors
 from ads.aqua.extension.utils import validate_function_parameters
 from ads.config import COMPARTMENT_OCID

ads/aqua/extension/finetune_handler.py

@@ -54,7 +54,6 @@ class AquaFineTuneHandler(AquaAPIhandler):
 
         self.finish(AquaFineTuningApp().create(CreateFineTuningDetails(**input_data)))
 
-    @handle_exceptions
     def get_finetuning_config(self, model_id):
         """Gets the finetuning config for Aqua model."""
         return self.finish(AquaFineTuningApp().get_finetuning_config(model_id=model_id))

ads/aqua/extension/ui_handler.py

@@ -34,6 +34,7 @@ class AquaUIHandler(AquaAPIhandler):
     HTTPError: For various failure scenarios such as invalid input format, missing data, etc.
     """
 
+    @handle_exceptions
     def get(self, id=""):
         """Handle GET request."""
         url_parse = urlparse(self.request.path)
@@ -76,7 +77,6 @@ class AquaUIHandler(AquaAPIhandler):
         else:
             raise HTTPError(400, f"The request {self.request.path} is invalid.")
 
-    @handle_exceptions
     def list_log_groups(self, **kwargs):
         """Lists all log groups for the specified compartment or tenancy."""
         compartment_id = self.get_argument("compartment_id", default=COMPARTMENT_OCID)
@@ -84,22 +84,18 @@ class AquaUIHandler(AquaAPIhandler):
             AquaUIApp().list_log_groups(compartment_id=compartment_id, **kwargs)
         )
 
-    @handle_exceptions
     def list_logs(self, log_group_id: str, **kwargs):
         """Lists the specified log group's log objects."""
         return self.finish(AquaUIApp().list_logs(log_group_id=log_group_id, **kwargs))
 
-    @handle_exceptions
     def list_compartments(self):
         """Lists the compartments in a compartment specified by ODSC_MODEL_COMPARTMENT_OCID env variable."""
         return self.finish(AquaUIApp().list_compartments())
 
-    @handle_exceptions
     def get_default_compartment(self):
         """Returns user compartment ocid."""
         return self.finish(AquaUIApp().get_default_compartment())
 
-    @handle_exceptions
     def list_model_version_sets(self, **kwargs):
         """Lists all model version sets for the specified compartment or tenancy."""
 
@@ -112,7 +108,6 @@ class AquaUIHandler(AquaAPIhandler):
             )
         )
 
-    @handle_exceptions
     def list_experiments(self, **kwargs):
         """Lists all experiments for the specified compartment or tenancy."""
 
@@ -125,7 +120,6 @@ class AquaUIHandler(AquaAPIhandler):
             )
         )
 
-    @handle_exceptions
     def list_buckets(self, **kwargs):
         """Lists all model version sets for the specified compartment or tenancy."""
         compartment_id = self.get_argument("compartment_id", default=COMPARTMENT_OCID)
@@ -138,7 +132,6 @@ class AquaUIHandler(AquaAPIhandler):
             )
         )
 
-    @handle_exceptions
     def list_job_shapes(self, **kwargs):
         """Lists job shapes available in the specified compartment."""
         compartment_id = self.get_argument("compartment_id", default=COMPARTMENT_OCID)
@@ -146,7 +139,6 @@ class AquaUIHandler(AquaAPIhandler):
             AquaUIApp().list_job_shapes(compartment_id=compartment_id, **kwargs)
         )
 
-    @handle_exceptions
     def list_vcn(self, **kwargs):
         """Lists the virtual cloud networks (VCNs) in the specified compartment."""
         compartment_id = self.get_argument("compartment_id", default=COMPARTMENT_OCID)
@@ -154,7 +146,6 @@ class AquaUIHandler(AquaAPIhandler):
             AquaUIApp().list_vcn(compartment_id=compartment_id, **kwargs)
         )
 
-    @handle_exceptions
     def list_subnets(self, **kwargs):
         """Lists the subnets in the specified VCN and the specified compartment."""
         compartment_id = self.get_argument("compartment_id", default=COMPARTMENT_OCID)
@@ -165,7 +156,6 @@ class AquaUIHandler(AquaAPIhandler):
             )
         )
 
-    @handle_exceptions
     def get_shape_availability(self, **kwargs):
         """For a given compartmentId, resource limit name, and scope, returns the number of available resources associated
         with the given limit."""
@@ -178,7 +168,6 @@ class AquaUIHandler(AquaAPIhandler):
             )
         )
 
-    @handle_exceptions
     def is_bucket_versioned(self):
         """For a given compartmentId, resource limit name, and scope, returns the number of available resources associated
         with the given limit."""

ads/aqua/extension/utils.py

@@ -4,16 +4,16 @@
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 from dataclasses import fields
 from typing import Dict, Optional
-from requests import HTTPError
+
+from tornado.web import HTTPError
 
 from ads.aqua.extension.base_handler import Errors
 
 
 def validate_function_parameters(data_class, input_data: Dict):
-    """Validates if the required parameters are provided in input data."""    
+    """Validates if the required parameters are provided in input data."""
     required_parameters = [
-        field.name for field in fields(data_class) 
-        if field.type != Optional[field.type]
+        field.name for field in fields(data_class) if field.type != Optional[field.type]
     ]
 
     for required_parameter in required_parameters:

ads/aqua/finetune.py

@@ -15,6 +15,7 @@ from oci.data_science.models import (
     UpdateModelProvenanceDetails,
 )
 
+from ads.aqua import ODSC_MODEL_COMPARTMENT_OCID, logger
 from ads.aqua.base import AquaApp
 from ads.aqua.data import AquaResourceIdentifier, Resource, Tags
 from ads.aqua.exception import AquaFileExistsError, AquaValueError
@@ -28,7 +29,6 @@ from ads.aqua.utils import (
     UNKNOWN,
     UNKNOWN_DICT,
     get_container_image,
-    logger,
     upload_local_to_os,
 )
 from ads.common.auth import default_signer
@@ -69,6 +69,7 @@ class FineTuneCustomMetadata(Enum):
 class AquaFineTuningParams(DataClassSerializable):
     epochs: int = None
     learning_rate: float = None
+    sample_packing: str = "True"
 
 
 @dataclass(repr=False)
@@ -122,6 +123,8 @@ class CreateFineTuningDetails(DataClassSerializable):
         The log group id for fine tuning job infrastructure.
     log_id: (str, optional). Defaults to `None`.
         The log id for fine tuning job infrastructure.
+    force_overwrite: (bool, optional). Defaults to `False`.
+        Whether to force overwrite the existing file in object storage.
     """
 
     ft_source_id: str
@@ -142,6 +145,7 @@ class CreateFineTuningDetails(DataClassSerializable):
     subnet_id: Optional[str] = None
     log_id: Optional[str] = None
     log_group_id: Optional[str] = None
+    force_overwrite: Optional[bool] = False
 
 
 class AquaFineTuningApp(AquaApp):
@@ -192,12 +196,11 @@ class AquaFineTuningApp(AquaApp):
                 )
 
         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
@@ -273,12 +276,12 @@ class AquaFineTuningApp(AquaApp):
                     src_uri=ft_dataset_path,
                     dst_uri=dst_uri,
                     auth=default_signer(),
-                    force_overwrite=False,
+                    force_overwrite=create_fine_tuning_details.force_overwrite,
                 )
             except FileExistsError:
                 raise AquaFileExistsError(
                     f"Dataset {dataset_file} already exists in {create_fine_tuning_details.report_path}. "
-                    "Please use a new dataset file name or report path."
+                    "Please use a new dataset file name, report path or set `force_overwrite` as True."
                 )
             logger.debug(
                 f"Uploaded local file {ft_dataset_path} to object storage {dst_uri}."
@@ -460,16 +463,26 @@ class AquaFineTuningApp(AquaApp):
         telemetry_kwargs = (
             {"ocid": ft_job.id[-6:]} if ft_job and len(ft_job.id) > 6 else {}
         )
+        # track shapes that were used for fine-tune creation
         self.telemetry.record_event_async(
-            category=f"aqua/service/{source.display_name}/finetune/create/shape/",
+            category=f"aqua/service/finetune/create/shape/",
             action=f"{create_fine_tuning_details.shape_name}x{create_fine_tuning_details.replica}",
             **telemetry_kwargs,
         )
         # tracks unique fine-tuned models that were created in the user compartment
+        # TODO: retrieve the service model name for FT custom models.
         self.telemetry.record_event_async(
             category="aqua/service/finetune",
             action="create",
             detail=source.display_name,
+            **telemetry_kwargs,
+        )
+        # track combination of model and shape used for fine-tune creation
+        self.telemetry.record_event_async(
+            category="aqua/service/finetune/create",
+            action="shape",
+            detail=f"{create_fine_tuning_details.shape_name}x{create_fine_tuning_details.replica}",
+            value=source.display_name,
         )
 
         return AquaFineTuningSummary(
@@ -550,7 +563,7 @@ class AquaFineTuningApp(AquaApp):
                         }
                     ),
                     "OCI__LAUNCH_CMD": (
-                        f"--micro_batch_size {batch_size} --num_epochs {parameters.epochs} --learning_rate {parameters.learning_rate} --training_data {dataset_path} --output_dir {report_path} --val_set_size {val_set_size} "
+                        f"--micro_batch_size {batch_size} --num_epochs {parameters.epochs} --learning_rate {parameters.learning_rate} --training_data {dataset_path} --output_dir {report_path} --val_set_size {val_set_size} --sample_packing {parameters.sample_packing} "
                         + (f"{finetuning_params}" if finetuning_params else "")
                     ),
                     "CONDA_BUCKET_NS": CONDA_BUCKET_NS,

ads/aqua/model.py

@@ -14,7 +14,7 @@ import oci
 from cachetools import TTLCache
 from oci.data_science.models import JobRun, Model
 
-from ads.aqua import logger, utils
+from ads.aqua import ODSC_MODEL_COMPARTMENT_OCID, logger, utils
 from ads.aqua.base import AquaApp
 from ads.aqua.constants import (
     TRAINING_METRICS_FINAL,
@@ -26,7 +26,6 @@ from ads.aqua.constants import (
 )
 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,
@@ -50,7 +49,6 @@ from ads.config import (
     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
@@ -228,7 +226,7 @@ class AquaFineTuneModel(AquaModel, AquaEvalFTCommon, DataClassSerializable):
             ).value
         except Exception as e:
             logger.debug(
-                f"Failed to extract model hyperparameters from {model.id}:" f"{str(e)}"
+                f"Failed to extract model hyperparameters from {model.id}: " f"{str(e)}"
             )
             model_hyperparameters = {}
 

ads/aqua/utils.py

@@ -10,7 +10,6 @@ import logging
 import os
 import random
 import re
-import sys
 from enum import Enum
 from functools import wraps
 from pathlib import Path
@@ -22,22 +21,16 @@ import oci
 from oci.data_science.models import JobRun, Model
 
 from ads.aqua.constants import RqsAdditionalDetails
-from ads.aqua.data import AquaResourceIdentifier, Tags
+from ads.aqua.data import AquaResourceIdentifier
 from ads.aqua.exception import AquaFileNotFoundError, AquaRuntimeError, AquaValueError
 from ads.common.auth import default_signer
 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_SERVICE_MODELS_BUCKET,
-    CONDA_BUCKET_NS,
-    TENANCY_OCID,
-)
+from ads.config import AQUA_SERVICE_MODELS_BUCKET, CONDA_BUCKET_NS, TENANCY_OCID
 from ads.model import DataScienceModel, ModelVersionSet
 
-# TODO: allow the user to setup the logging level?
-logging.basicConfig(stream=sys.stdout, level=logging.INFO)
-logger = logging.getLogger("ODSC_AQUA")
+logger = logging.getLogger("ads.aqua")
 
 UNKNOWN = ""
 UNKNOWN_DICT = {}
@@ -79,6 +72,9 @@ 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"
+AQUA_GA_LIST = ["id19sfcrra6z"]
+AQUA_MODEL_TYPE_SERVICE = "service"
+AQUA_MODEL_TYPE_CUSTOM = "custom"
 
 
 class LifecycleStatus(Enum):
@@ -144,10 +140,6 @@ SUPPORTED_FILE_FORMATS = ["jsonl"]
 MODEL_BY_REFERENCE_OSS_PATH_KEY = "artifact_location"
 
 
-def get_logger():
-    return logger
-
-
 def random_color_generator(word: str):
     seed = sum([ord(c) for c in word]) % 13
     random.seed(seed)
@@ -234,7 +226,7 @@ def read_file(file_path: str, **kwargs) -> str:
         with fsspec.open(file_path, "r", **kwargs.get("auth", {})) as f:
             return f.read()
     except Exception as e:
-        logger.error(f"Failed to read file {file_path}. {e}")
+        logger.debug(f"Failed to read file {file_path}. {e}")
         return UNKNOWN
 
 
@@ -484,7 +476,7 @@ def _build_resource_identifier(
             ),
         )
     except Exception as e:
-        logger.error(
+        logger.debug(
             f"Failed to construct AquaResourceIdentifier from given id=`{id}`, and name=`{name}`, {str(e)}"
         )
         return AquaResourceIdentifier()
@@ -577,20 +569,27 @@ def get_container_image(
     return container_image
 
 
-def fetch_service_compartment():
-    """Loads the compartment mapping json from service bucket"""
+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.
+    """
     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,
-    )
+    try:
+        config = load_config(
+            file_path=config_file_name,
+            config_file_name=CONTAINER_INDEX,
+        )
+    except AquaFileNotFoundError:
+        logger.error(
+            f"Config file {config_file_name}/{CONTAINER_INDEX} to fetch service compartment OCID could not be found."
+        )
+        return
     compartment_mapping = config.get(COMPARTMENT_MAPPING_KEY)
     if compartment_mapping:
         return compartment_mapping.get(CONDA_BUCKET_NS)
-    return None
 
 
 def get_max_version(versions):
@@ -733,3 +732,20 @@ 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
+
+
+def get_ocid_substring(ocid: str, key_len: int) -> str:
+    """This helper function returns the last n characters of the ocid specified by key_len parameter.
+    If ocid is None or length is less than key_len, it returns an empty string."""
+    return ocid[-key_len:] if ocid and len(ocid) > key_len else ""

ads/cli.py

@@ -8,6 +8,7 @@ import traceback
 import sys
 
 import fire
+from dataclasses import is_dataclass
 from ads.common import logger
 
 try:
@@ -70,11 +71,28 @@ def _SeparateFlagArgs(args):
 fire.core.parser.SeparateFlagArgs = _SeparateFlagArgs
 
 
+def serialize(data):
+    """Serialize dataclass objects or lists of dataclass objects.
+    Parameters:
+        data: A dataclass object or a list of dataclass objects.
+    Returns:
+        None
+    Prints:
+        The string representation of each dataclass object.
+    """
+    if isinstance(data, list):
+        [print(str(item)) for item in data]
+    else:
+        print(str(data))
+
+
 def cli():
     if len(sys.argv) > 1 and sys.argv[1] == "aqua":
         from ads.aqua.cli import AquaCommand
 
-        fire.Fire(AquaCommand, command=sys.argv[2:], name="ads aqua")
+        fire.Fire(
+            AquaCommand, command=sys.argv[2:], name="ads aqua", serialize=serialize
+        )
     else:
         click_cli()
 

ads/common/serializer.py

@@ -195,7 +195,10 @@ class Serializable(ABC):
             `None` in case when `uri` provided.
         """
         json_string = json.dumps(
-            self.to_dict(**kwargs), cls=encoder, default=default or self.serialize
+            self.to_dict(**kwargs),
+            cls=encoder,
+            default=default or self.serialize,
+            indent=4,
         )
         if uri:
             self._write_to_file(s=json_string, uri=uri, **kwargs)
@@ -463,9 +466,7 @@ class DataClassSerializable(Serializable):
                 "These fields will be ignored."
             )
 
-        obj = cls(
-            **{key: obj_dict.get(key) for key in allowed_fields}
-        )
+        obj = cls(**{key: obj_dict.get(key) for key in allowed_fields})
 
         for key, value in obj_dict.items():
             if (

ads/common/utils.py

@@ -102,6 +102,8 @@ DIMENSION = 2
 # The number of worker processes to use in parallel for uploading individual parts of a multipart upload.
 DEFAULT_PARALLEL_PROCESS_COUNT = 9
 
+LOG_LEVELS = ["NOTSET", "DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"]
+
 
 class FileOverwriteError(Exception):  # pragma: no cover
     pass
@@ -1751,7 +1753,7 @@ def get_log_links(
 ) -> str:
     """
     This method returns the web console link for the given log ids.
-    
+
     Parameters
     ----------
     log_group_id: str, required
@@ -1776,7 +1778,9 @@ def get_log_links(
         query_range = f'''search "{compartment_id}/{log_group_id}/{log_id}"'''
         query_source = f"source='{source_id}'"
         sort_condition = f"sort by datetime desc&regions={region}"
-        search_query = f"search?searchQuery={query_range} | {query_source} | {sort_condition}"
+        search_query = (
+            f"search?searchQuery={query_range} | {query_source} | {sort_condition}"
+        )
         console_link_url = f"https://cloud.oracle.com/logging/{search_query}"
     elif log_group_id:
         console_link_url = f"https://cloud.oracle.com/logging/log-groups/{log_group_id}?region={region}"

ads/config.py

@@ -79,6 +79,7 @@ AQUA_TELEMETRY_BUCKET = os.environ.get(
     "AQUA_TELEMETRY_BUCKET", "service-managed-models"
 )
 AQUA_TELEMETRY_BUCKET_NS = os.environ.get("AQUA_TELEMETRY_BUCKET_NS", CONDA_BUCKET_NS)
+
 DEBUG_TELEMETRY = os.environ.get("DEBUG_TELEMETRY", None)
 AQUA_SERVICE_NAME = "aqua"
 DATA_SCIENCE_SERVICE_NAME = "data-science"