Logging updates for Aqua (#807)

Author: VipulMascarenhas

ads/aqua/__init__.py

@@ -14,7 +14,7 @@
 
 
 def get_logger_level():
-    """Retrieves logging level from environment variable `LOG_LEVEL`."""
+    """Retrieves logging level from environment variable `ADS_AQUA_LOG_LEVEL`."""
     level = os.environ.get(ENV_VAR_LOG_LEVEL, "INFO").upper()
     return level
 

ads/aqua/base.py

@@ -163,7 +163,6 @@ def create_model_version_set(
         tag = Tags.AQUA_FINE_TUNING.value
 
         if not model_version_set_id:
-            tag = Tags.AQUA_FINE_TUNING.value  # TODO: Fix this
             try:
                 model_version_set = ModelVersionSet.from_name(
                     name=model_version_set_name,

ads/aqua/cli.py

@@ -17,6 +17,7 @@
 from ads.aqua.finetune import AquaFineTuningApp
 from ads.aqua.model import AquaModelApp
 from ads.config import NB_SESSION_OCID
+from ads.common.utils import LOG_LEVELS
 
 
 class AquaCommand:
@@ -47,14 +48,20 @@ def __init__(
             or 'ERROR' if not set. Example values include 'DEBUG', 'INFO',
             'WARNING', 'ERROR', and 'CRITICAL'.
         """
+        if log_level not in LOG_LEVELS:
+            logger.error(
+                f"Log level should be one of {LOG_LEVELS}. Setting default to ERROR."
+            )
+            log_level = "ERROR"
         set_log_level(log_level)
         # gracefully exit if env var is not set
         if not ODSC_MODEL_COMPARTMENT_OCID:
-            logger.error(
+            logger.debug(
                 "ODSC_MODEL_COMPARTMENT_OCID environment variable is not set for Aqua."
             )
             if NB_SESSION_OCID:
                 logger.error(
-                    f"Aqua is not available for the notebook session {NB_SESSION_OCID}."
+                    f"Aqua is not available for the notebook session {NB_SESSION_OCID}. For more information, "
+                    f"please refer to the documentation."
                 )
             sys.exit(1)

ads/aqua/deployment.py

@@ -23,6 +23,8 @@
     get_resource_name,
     get_model_by_reference_paths,
     get_ocid_substring,
+    AQUA_MODEL_TYPE_SERVICE,
+    AQUA_MODEL_TYPE_CUSTOM,
 )
 from ads.aqua.finetune import FineTuneCustomMetadata
 from ads.aqua.data import AquaResourceIdentifier
@@ -392,7 +394,9 @@ def create(
             .with_runtime(container_runtime)
         ).deploy(wait_for_completion=False)
 
-        model_type = "custom" if is_fine_tuned_model else "service"
+        model_type = (
+            AQUA_MODEL_TYPE_CUSTOM if is_fine_tuned_model else AQUA_MODEL_TYPE_SERVICE
+        )
         deployment_id = deployment.dsc_model_deployment.id
         # we arbitrarily choose last 8 characters of OCID to identify MD in telemetry
         telemetry_kwargs = {"ocid": get_ocid_substring(deployment_id, key_len=8)}

ads/aqua/utils.py

@@ -73,6 +73,8 @@
 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):

ads/common/utils.py

@@ -102,6 +102,8 @@
 # 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}"