From 460285896141f01c418a1ed51df6b7f8843d4938 Mon Sep 17 00:00:00 2001 From: MING KANG Date: Thu, 18 Apr 2024 14:58:17 -0400 Subject: [PATCH 1/4] Set AQUA logging through environment variables and CLI argument --- ads/aqua/__init__.py | 24 ++---------------------- ads/aqua/evaluation.py | 4 ++-- ads/aqua/utils.py | 1 + 3 files changed, 5 insertions(+), 24 deletions(-) diff --git a/ads/aqua/__init__.py b/ads/aqua/__init__.py index 779686348..c025083ef 100644 --- a/ads/aqua/__init__.py +++ b/ads/aqua/__init__.py @@ -4,11 +4,9 @@ # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/ -import logging import os -import sys -from ads import set_auth +from ads import logger, set_auth from ads.aqua.utils import fetch_service_compartment from ads.config import NB_SESSION_OCID, OCI_RESOURCE_PRINCIPAL_VERSION @@ -21,25 +19,7 @@ def get_logger_level(): return level -def configure_aqua_logger(): - """Configures the AQUA logger.""" - log_level = get_logger_level() - logger = logging.getLogger(__name__) - logger.setLevel(log_level) - - handler = logging.StreamHandler(sys.stdout) - formatter = logging.Formatter( - "%(asctime)s - %(name)s.%(module)s - %(levelname)s - %(message)s" - ) - handler.setFormatter(formatter) - handler.setLevel(log_level) - - logger.addHandler(handler) - logger.propagate = False - return logger - - -logger = configure_aqua_logger() +logger.setLevel(get_logger_level()) def set_log_level(log_level: str): diff --git a/ads/aqua/evaluation.py b/ads/aqua/evaluation.py index e796e3b37..d800482ef 100644 --- a/ads/aqua/evaluation.py +++ b/ads/aqua/evaluation.py @@ -777,7 +777,7 @@ def _build_evaluation_runtime( ) return runtime - + @staticmethod def _get_service_model_name( source: Union[ModelDeployment, DataScienceModel] @@ -803,7 +803,7 @@ def _get_service_model_name( return source.freeform_tags.get(Tags.AQUA_MODEL_NAME_TAG.value) else: return extract_id_and_name_from_tag(fine_tuned_model_tag)[1] - + return source.display_name @staticmethod diff --git a/ads/aqua/utils.py b/ads/aqua/utils.py index d8d424347..7d79e68fb 100644 --- a/ads/aqua/utils.py +++ b/ads/aqua/utils.py @@ -20,6 +20,7 @@ import oci from oci.data_science.models import JobRun, Model +from ads.aqua import logger from ads.aqua.constants import RqsAdditionalDetails from ads.aqua.data import AquaResourceIdentifier from ads.aqua.exception import AquaFileNotFoundError, AquaRuntimeError, AquaValueError From d4d60491d3e1a85d70acfdeeb95bae5427c1ece2 Mon Sep 17 00:00:00 2001 From: MING KANG Date: Thu, 18 Apr 2024 15:16:06 -0400 Subject: [PATCH 2/4] fixed circular import issues --- ads/aqua/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ads/aqua/utils.py b/ads/aqua/utils.py index 7d79e68fb..dd122ca81 100644 --- a/ads/aqua/utils.py +++ b/ads/aqua/utils.py @@ -10,6 +10,7 @@ import os import random import re +import sys from enum import Enum from functools import wraps from pathlib import Path @@ -20,9 +21,8 @@ import oci from oci.data_science.models import JobRun, Model -from ads.aqua import logger from ads.aqua.constants import RqsAdditionalDetails -from ads.aqua.data import AquaResourceIdentifier +from ads.aqua.data import AquaResourceIdentifier, Tags from ads.aqua.exception import AquaFileNotFoundError, AquaRuntimeError, AquaValueError from ads.common.auth import default_signer from ads.common.object_storage_details import ObjectStorageDetails From d1ccdde239cfff36b72ae1ab50934484e08a5c71 Mon Sep 17 00:00:00 2001 From: MING KANG Date: Fri, 19 Apr 2024 11:13:55 -0400 Subject: [PATCH 3/4] improvements on logging --- ads/aqua/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ads/aqua/utils.py b/ads/aqua/utils.py index dd122ca81..b8eed4d9b 100644 --- a/ads/aqua/utils.py +++ b/ads/aqua/utils.py @@ -22,7 +22,7 @@ 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 cac54fea308f3bb8963d9852fd416465fc3339f2 Mon Sep 17 00:00:00 2001 From: MING KANG Date: Fri, 19 Apr 2024 11:29:42 -0400 Subject: [PATCH 4/4] removed no use import --- ads/aqua/utils.py | 1 - 1 file changed, 1 deletion(-) diff --git a/ads/aqua/utils.py b/ads/aqua/utils.py index b8eed4d9b..d8d424347 100644 --- a/ads/aqua/utils.py +++ b/ads/aqua/utils.py @@ -10,7 +10,6 @@ import os import random import re -import sys from enum import Enum from functools import wraps from pathlib import Path