Skip to content

Commit

Permalink
add time format and fix typing
Browse files Browse the repository at this point in the history
  • Loading branch information
sainivedh committed Nov 28, 2023
1 parent 356a5a7 commit d70a7e4
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
9 changes: 5 additions & 4 deletions clarifai/utils/logging.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import logging
from collections import defaultdict
from typing import Dict, List, Optional
from typing import Dict, List, Optional, Union

from rich import print as rprint
from rich.logging import RichHandler
Expand Down Expand Up @@ -73,7 +73,7 @@ def _get_library_name() -> str:
return __name__.split(".")[0]


def _configure_logger(name: str, logger_level: str = "ERROR") -> None:
def _configure_logger(name: str, logger_level: Union[int, str] = logging.NOTSET) -> None:
"""Configure the logger with the specified name."""

logger = logging.getLogger(name)
Expand All @@ -84,13 +84,14 @@ def _configure_logger(name: str, logger_level: str = "ERROR") -> None:
logger.removeHandler(handler)

# Add the new rich handler and formatter
handler = RichHandler(rich_tracebacks=True)
handler = RichHandler(rich_tracebacks=True, log_time_format="%Y-%m-%d %H:%M:%S")
formatter = logging.Formatter('%(name)s: %(message)s')
handler.setFormatter(formatter)
logger.addHandler(handler)


def get_logger(logger_level: str = "ERROR", name: Optional[str] = None) -> logging.Logger:
def get_logger(logger_level: Union[int, str] = logging.NOTSET,
name: Optional[str] = None) -> logging.Logger:
"""Return a logger with the specified name."""

if name is None:
Expand Down
6 changes: 3 additions & 3 deletions tests/test_misc.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ def test_get_logger():
assert isinstance(logger.handlers[0], RichHandler)


def test_get_logger_default_name():
logger = get_logger("DEBUG")
assert logger.level == logging.DEBUG
def test_get_logger_defaults():
logger = get_logger()
assert logger.level == logging.NOTSET
assert logger.name == _get_library_name()
assert isinstance(logger.handlers[0], RichHandler)

0 comments on commit d70a7e4

Please sign in to comment.