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