From e90ead3b35eb718f1c87b1660529717720c737fb Mon Sep 17 00:00:00 2001 From: AlpinDale Date: Mon, 1 Apr 2024 22:57:56 +0000 Subject: [PATCH 1/5] chore: make log level configurable via env variable --- common/logger.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/common/logger.py b/common/logger.py index 3498b62..f23b9b2 100644 --- a/common/logger.py +++ b/common/logger.py @@ -1,7 +1,7 @@ """ Internal logging utility. """ - +import os import logging from loguru import logger from rich.console import Console @@ -95,10 +95,11 @@ def setup_logger(): """Bootstrap the logger.""" logger.remove() + log_level = os.getenv("TABBY_LOG_LEVEL", "INFO") logger.add( RICH_CONSOLE.print, - level="INFO", + level=log_level, format=_log_formatter, colorize=True, ) From 031349133bd560028f22380c646b094007097312 Mon Sep 17 00:00:00 2001 From: AlpinDale Date: Mon, 1 Apr 2024 23:03:16 +0000 Subject: [PATCH 2/5] properly order imports --- common/logger.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common/logger.py b/common/logger.py index f23b9b2..bc41244 100644 --- a/common/logger.py +++ b/common/logger.py @@ -1,8 +1,9 @@ """ Internal logging utility. """ -import os import logging +import os + from loguru import logger from rich.console import Console from rich.markup import escape From 6c4a1a9c70cdb3fff7d19c6a0055ad92188da7e7 Mon Sep 17 00:00:00 2001 From: AlpinDale Date: Mon, 1 Apr 2024 23:07:30 +0000 Subject: [PATCH 3/5] make log level a global var --- common/logger.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/common/logger.py b/common/logger.py index bc41244..864deb6 100644 --- a/common/logger.py +++ b/common/logger.py @@ -19,7 +19,7 @@ from rich.progress import ( from common.utils import unwrap RICH_CONSOLE = Console() - +LOG_LEVEL = os.getenv("TABBY_LOG_LEVEL", "INFO")a def get_loading_progress_bar(): """Gets a pre-made progress bar for loading tasks.""" @@ -88,7 +88,7 @@ UVICORN_LOG_CONFIG = { "class": f"{UvicornLoggingHandler.__module__}.{UvicornLoggingHandler.__qualname__}", # noqa }, }, - "root": {"handlers": ["uvicorn"], "propagate": False, "level": "INFO"}, + "root": {"handlers": ["uvicorn"], "propagate": False, "level": LOG_LEVEL}, } @@ -96,11 +96,10 @@ def setup_logger(): """Bootstrap the logger.""" logger.remove() - log_level = os.getenv("TABBY_LOG_LEVEL", "INFO") logger.add( RICH_CONSOLE.print, - level=log_level, + level=LOG_LEVEL, format=_log_formatter, colorize=True, ) From 5e599ddbd42ce43a430952f855b54a590d9e4f7c Mon Sep 17 00:00:00 2001 From: AlpinDale Date: Mon, 1 Apr 2024 23:08:28 +0000 Subject: [PATCH 4/5] typo --- common/logger.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/logger.py b/common/logger.py index 864deb6..95f5cd3 100644 --- a/common/logger.py +++ b/common/logger.py @@ -19,7 +19,7 @@ from rich.progress import ( from common.utils import unwrap RICH_CONSOLE = Console() -LOG_LEVEL = os.getenv("TABBY_LOG_LEVEL", "INFO")a +LOG_LEVEL = os.getenv("TABBY_LOG_LEVEL", "INFO") def get_loading_progress_bar(): """Gets a pre-made progress bar for loading tasks.""" From 1650e6e6406edf797576c077aaceafcf28895c26 Mon Sep 17 00:00:00 2001 From: AlpinDale Date: Mon, 1 Apr 2024 23:11:30 +0000 Subject: [PATCH 5/5] ruff --- common/logger.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/logger.py b/common/logger.py index 95f5cd3..82e68dd 100644 --- a/common/logger.py +++ b/common/logger.py @@ -1,6 +1,7 @@ """ Internal logging utility. """ + import logging import os @@ -21,6 +22,7 @@ from common.utils import unwrap RICH_CONSOLE = Console() LOG_LEVEL = os.getenv("TABBY_LOG_LEVEL", "INFO") + def get_loading_progress_bar(): """Gets a pre-made progress bar for loading tasks."""