nuclear 2.2.3__tar.gz → 2.2.5__tar.gz

{nuclear-2.2.3 → nuclear-2.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nuclear
-Version: 2.2.3
+Version: 2.2.5
 Summary: Declarative parser for command line interfaces
 Home-page: https://github.com/igrek51/nuclear
 Author: igrek51

{nuclear-2.2.3 → nuclear-2.2.5}/nuclear/sublog/logging.py

@@ -12,7 +12,7 @@ from colorama import init, Fore, Style
 
 from nuclear.sublog.context_error import ContextError
 from nuclear.sublog.exception import extended_exception_details
-from nuclear.utils.collections import filter_not_none
+from nuclear.utils.collections import coalesce
 from nuclear.utils.env import is_env_flag_enabled
 from nuclear.utils.strings import strip_ansi_colors
 
@@ -22,16 +22,22 @@ LOG_DATE_FORMAT_UTC = r'%Y-%m-%d %H:%M:%SZ'
 ISO_DATE_FORMAT = r'%Y-%m-%dT%H:%M:%S.%fZ'
 LOGGING_LOGGER_NAME = 'nuclear.sublog'
 
-log_level: str = os.environ.get('NUCLEAR_LOG_LEVEL', 'debug')
-log_level_show: bool = is_env_flag_enabled('NUCLEAR_LOG_LEVEL_SHOW', 'true')
-log_time_show: bool = is_env_flag_enabled('NUCLEAR_LOG_TIME', 'true')
 simultaneous_print_lock = threading.Lock()
 _logging_logger: logging.Logger = logging.getLogger(LOGGING_LOGGER_NAME)
 _log_state = {'init': False}
 
 
-def init_logs():
-    """Configure loggers: formatters, handlers and log levels"""
+def init_logs(
+    show_time: Optional[bool] = None,
+    show_log_level: Optional[bool] = None,
+):
+    """
+    Configure loggers: formatters, handlers and log levels
+    :param show_time: True to display formatted time in each log message,
+    False to turn it off, None to use the default
+    :param show_log_level: True to display log level in each log message,
+    False to turn it off, None to use the default
+    """
     logging_kwargs: Dict[str, Any] = {
         'stream': sys.stdout,
         'format': LOG_FORMAT,
@@ -46,16 +52,24 @@ def init_logs():
         for handler in logging.getLogger().handlers:
             handler.setFormatter(StructuredFormatter())
     else:
+        _show_log_time: bool = coalesce(show_time, is_env_flag_enabled('NUCLEAR_LOG_TIME', 'true'))
+        _show_log_level: bool = coalesce(show_log_level, is_env_flag_enabled('NUCLEAR_LOG_LEVEL_SHOW', 'true'))
         logging.basicConfig(**logging_kwargs)
         for handler in logging.getLogger().handlers:
-            handler.setFormatter(ColoredFormatter())
+            handler.setFormatter(ColoredFormatter(_show_log_time, _show_log_level))
 
+    log_level: str = os.environ.get('NUCLEAR_LOG_LEVEL', 'debug')
     level = _get_logging_level(log_level)
     root_logger = logging.getLogger(LOGGING_LOGGER_NAME)
     root_logger.setLevel(level)
     _log_state['init'] = True
 
 
+def init_logs_once():
+    if not _log_state['init']:
+        init_logs()
+
+
 def get_logger(logger_name: str) -> logging.Logger:
     """
     Get configured child logger
@@ -150,8 +164,10 @@ def add_context(context_name: str, log: bool = False, **ctx):
 
 
 class ColoredFormatter(logging.Formatter):
-    def __init__(self):
+    def __init__(self, log_time_show: bool, log_level_show: bool):
         logging.Formatter.__init__(self)
+        self.log_level_show: bool = log_level_show
+        self.log_time_show: bool = log_time_show
 
     log_level_templates = {
         'CRITICAL': f'{Style.BRIGHT + Fore.RED}CRIT {Style.RESET_ALL}',
@@ -162,18 +178,22 @@ class ColoredFormatter(logging.Formatter):
     }
 
     def format(self, record: logging.LogRecord) -> str:
-        part_levelname = self.log_level_templates.get(record.levelname, record.levelname) if log_level_show else None
-        part_message = record.msg
+        parts: List[str] = []
         part_time = self.format_time()
-        parts: List[str] = filter_not_none([part_time, part_levelname, part_message])
+        if part_time:
+            parts.append(part_time)
+        if self.log_level_show:
+            part_levelname = self.log_level_templates.get(record.levelname, record.levelname)
+            parts.append(part_levelname)
+        log_message: str = record.getMessage()
+        parts.append(log_message)
         line = ' '.join(parts)
         if not sys.stdout.isatty():
             line = strip_ansi_colors(line)
         return line
     
-    @staticmethod
-    def format_time() -> Optional[str]:
-        if not log_time_show:
+    def format_time(self) -> Optional[str]:
+        if not self.log_time_show:
             return None
         now_tz = datetime.now().astimezone()
         if time.timezone == 0:

{nuclear-2.2.3 → nuclear-2.2.5}/nuclear/utils/collections.py

@@ -46,3 +46,10 @@ def flatten(collection: Iterable[Union[T, List[T]]]) -> List[T]:
 
 def filter_not_none(items: List[Optional[T]]) -> List[T]:
     return [item for item in items if item is not None]
+
+
+def coalesce(*items: Optional[T]) -> T:
+    for item in items:
+        if item is not None:
+            return item
+    raise ValueError('all items are None')

nuclear-2.2.5/nuclear/version.py

@@ -0,0 +1 @@
+__version__ = "2.2.5"

{nuclear-2.2.3 → nuclear-2.2.5}/nuclear.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nuclear
-Version: 2.2.3
+Version: 2.2.5
 Summary: Declarative parser for command line interfaces
 Home-page: https://github.com/igrek51/nuclear
 Author: igrek51

nuclear-2.2.3/nuclear/version.py

@@ -1 +0,0 @@
-__version__ = "2.2.3"