Skip to content

Followup comment in #795: reuse the logger in ads.init #800

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mingkang111 merged 4 commits into from
Apr 22, 2024
Merged

Followup comment in #795: reuse the logger in ads.init #800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4602858
Set AQUA logging through environment variables and CLI argument
mingkang111 Apr 18, 2024
d4d6049
fixed circular import issues
mingkang111 Apr 18, 2024
d1ccdde
improvements on logging
mingkang111 Apr 19, 2024
cac54fe
removed no use import
mingkang111 Apr 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 2 additions & 22 deletions ads/aqua/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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):
Expand Down
4 changes: 2 additions & 2 deletions ads/aqua/evaluation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -777,7 +777,7 @@ def _build_evaluation_runtime(
)

return runtime

@staticmethod
def _get_service_model_name(
source: Union[ModelDeployment, DataScienceModel]
Expand All @@ -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
Expand Down