logger-36 2024.18__py3-none-any.whl → 2024.19__py3-none-any.whl

logger_36/catalog/config/console_rich.py

@@ -24,6 +24,9 @@ ACTUAL_COLOR = "indian_red"
 EXPECTED_COLOR = "green"
 ELAPSED_TIME_COLOR = "green"
 
+ALTERNATIVE_BACKGROUND_FOR_LIGHT = style_t(bgcolor=color_t.from_rgb(230, 230, 230))
+ALTERNATIVE_BACKGROUND_FOR_DARK = style_t(bgcolor=color_t.from_rgb(25, 25, 25))
+
 GRAY_STYLE = style_t(color=color_t.from_rgb(150, 150, 150))
 
 """

logger_36/catalog/handler/console_rich.py

@@ -10,6 +10,8 @@ import typing as h
 
 from logger_36.catalog.config.console_rich import (
     ACTUAL_COLOR,
+    ALTERNATIVE_BACKGROUND_FOR_DARK,
+    ALTERNATIVE_BACKGROUND_FOR_LIGHT,
     DATE_TIME_COLOR,
     ELAPSED_TIME_COLOR,
     EXPECTED_COLOR,
@@ -49,9 +51,20 @@ _EXCLUSIVE_TRACEBACK_ARGUMENTS = (
 
 @d.dataclass(slots=True, repr=False, eq=False)
 class console_rich_handler_t(lggg.Handler):
+    """
+    alternating_lines:
+    - Initial value:
+        - 1: enabled for dark background
+        - 2: enabled for light background
+        - anything else: disabled
+    - Runtime value: 0/1=do not/do highlight next time.
+    """
+
     extension: handler_extension_t = d.field(init=False)
     console: console_t = d.field(init=False)
     FormattedLines: h.Callable[..., tuple[str, str | None]] = d.field(init=False)
+    alternating_lines: int = 0
+    background_is_light: bool = True
 
     name: d.InitVar[str | None] = None
     level: d.InitVar[int] = lggg.NOTSET
@@ -60,6 +73,7 @@ class console_rich_handler_t(lggg.Handler):
     message_width: d.InitVar[int] = -1
     formatter: d.InitVar[lggg.Formatter | None] = None
     should_install_traceback: d.InitVar[bool] = False
+    should_record: d.InitVar[bool] = False
 
     rich_kwargs: d.InitVar[dict[str, h.Any] | None] = None
 
@@ -72,6 +86,7 @@ class console_rich_handler_t(lggg.Handler):
         message_width: int,
         formatter: lggg.Formatter | None,
         should_install_traceback: bool,
+        should_record: bool,
         rich_kwargs: dict[str, h.Any] | None,
     ) -> None:
         """"""
@@ -103,7 +118,7 @@ class console_rich_handler_t(lggg.Handler):
         self.console = console_t(
             highlight=False,
             force_terminal=True,
-            record=True,
+            record=should_record,
             **rich_console_kwargs,
         )
         if should_install_traceback:
@@ -111,52 +126,83 @@ class console_rich_handler_t(lggg.Handler):
             InstallTracebackHandler(**rich_traceback_kwargs)
 
         self.FormattedLines = self.extension.FormattedLines
+        if self.alternating_lines == 1:
+            self.alternating_lines = 0
+            self.background_is_light = False
+        elif self.alternating_lines == 2:
+            self.alternating_lines = 0
+            self.background_is_light = True
+        else:
+            self.alternating_lines = -1
 
     def emit(self, record: lggg.LogRecord, /) -> None:
         """"""
-        cls = self.__class__
         if hasattr(record, SHOW_W_RULE_ATTR):
             richer = Rule(record.msg, DATE_TIME_COLOR)
         else:
             first, next_s = self.FormattedLines(record, PreProcessed=EscapedForRich)
-            richer = cls.HighlightedVersion(first, next_s, record.levelno)
+            should_highlight_back = self.alternating_lines == 1
+            if self.alternating_lines >= 0:
+                self.alternating_lines = (self.alternating_lines + 1) % 2
+            richer = HighlightedVersion(
+                self.console,
+                first,
+                next_s,
+                record.levelno,
+                should_highlight_back=should_highlight_back,
+                background_is_light=self.background_is_light,
+            )
         self.console.print(richer, crop=False, overflow="ignore")
 
     def ShowMessage(self, message: str, /) -> None:
         """"""
         self.console.print(message, crop=False, overflow="ignore")
 
-    @classmethod
-    def HighlightedVersion(
-        cls, first_line: str, next_lines: str | None, log_level: int, /
-    ) -> renderable_t:
-        """"""
-        output = text_t(first_line)
-
-        # Used instead of _CONTEXT_LENGTH which might include \t, thus creating a
-        # mismatch between character length and length when displayed in console.
-        context_end = first_line.find(LEVEL_CLOSING)
-        elapsed_time_separator = first_line.rfind(ELAPSED_TIME_SEPARATOR)
-        where_separator = first_line.rfind(
-            WHERE_SEPARATOR, context_end, elapsed_time_separator
-        )
-
-        output.stylize(DATE_TIME_COLOR, end=TIME_LENGTH)
-        output.stylize(
-            LEVEL_COLOR[log_level],
-            start=TIME_LENGTH,
-            end=context_end + 1,
-        )
-        output.stylize(GRAY_STYLE, start=where_separator, end=elapsed_time_separator)
-        output.stylize(ELAPSED_TIME_COLOR, start=elapsed_time_separator)
-
-        if next_lines is not None:
-            output.append(next_lines)
 
-        _ = output.highlight_regex(ACTUAL_PATTERNS, style=ACTUAL_COLOR)
-        _ = output.highlight_regex(EXPECTED_PATTERNS, style=EXPECTED_COLOR)
+def HighlightedVersion(
+    _: console_t,
+    first_line: str,
+    next_lines: str | None,
+    log_level: int,
+    /,
+    *,
+    should_highlight_back: bool = False,
+    background_is_light: bool = True,
+) -> renderable_t:
+    """"""
+    output = text_t(first_line)
+
+    # Used instead of _CONTEXT_LENGTH which might include \t, thus creating a
+    # mismatch between character length and length when displayed in console.
+    context_end = first_line.find(LEVEL_CLOSING)
+    elapsed_time_separator = first_line.rfind(ELAPSED_TIME_SEPARATOR)
+    where_separator = first_line.rfind(
+        WHERE_SEPARATOR, context_end, elapsed_time_separator
+    )
+
+    output.stylize(DATE_TIME_COLOR, end=TIME_LENGTH)
+    output.stylize(
+        LEVEL_COLOR[log_level],
+        start=TIME_LENGTH,
+        end=context_end + 1,
+    )
+    output.stylize(GRAY_STYLE, start=where_separator, end=elapsed_time_separator)
+    output.stylize(ELAPSED_TIME_COLOR, start=elapsed_time_separator)
+
+    if next_lines is not None:
+        output.append(next_lines)
+
+    _ = output.highlight_regex(ACTUAL_PATTERNS, style=ACTUAL_COLOR)
+    _ = output.highlight_regex(EXPECTED_PATTERNS, style=EXPECTED_COLOR)
+
+    if should_highlight_back:
+        if background_is_light:
+            style = ALTERNATIVE_BACKGROUND_FOR_LIGHT
+        else:
+            style = ALTERNATIVE_BACKGROUND_FOR_DARK
+        output.stylize(style)
 
-        return output
+    return output
 
 
 """

logger_36/catalog/handler/generic.py

@@ -10,7 +10,7 @@ import typing as h
 
 try:
     from logger_36.catalog.config.console_rich import DATE_TIME_COLOR
-    from logger_36.catalog.handler.console_rich import console_rich_handler_t
+    from logger_36.catalog.handler.console_rich import HighlightedVersion
     from rich.console import Console as console_t
     from rich.console import ConsoleOptions as console_options_t
     from rich.markup import escape as EscapedForRich
@@ -32,11 +32,21 @@ interface_h = can_show_message_p | h.Callable[[str], None]
 
 @d.dataclass(slots=True, repr=False, eq=False)
 class generic_handler_t(lggg.Handler):
+    """
+    alternating_lines:
+    - Initial value:
+        - 1: enabled for dark background
+        - 2: enabled for light background
+        - anything else: disabled
+    - Runtime value: 0/1=do not/do highlight next time.
+    """
 
     extension: handler_extension_t = d.field(init=False)
     console: console_t = None
     console_options: console_options_t = None
     FormattedLines: h.Callable[..., tuple[str, str | None]] = d.field(init=False)
+    alternating_lines: int = 0
+    background_is_light: bool = True
     ShowMessage: h.Callable[[str], None] = lambda _arg: None
 
     name: d.InitVar[str | None] = None
@@ -47,6 +57,7 @@ class generic_handler_t(lggg.Handler):
     formatter: d.InitVar[lggg.Formatter | None] = None
 
     supports_html: d.InitVar[bool] = False
+    should_record: d.InitVar[bool] = (False,)
     rich_kwargs: d.InitVar[dict[str, h.Any] | None] = None
     interface: d.InitVar[interface_h | None] = None  # Cannot be None actually.
 
@@ -59,6 +70,7 @@ class generic_handler_t(lggg.Handler):
         message_width: int,
         formatter: lggg.Formatter | None,
         supports_html: bool,
+        should_record: bool,
         rich_kwargs: dict[str, h.Any] | None,
         interface: interface_h | None,
     ) -> None:
@@ -81,6 +93,7 @@ class generic_handler_t(lggg.Handler):
             self.console = console_t(
                 highlight=False,
                 force_terminal=True,
+                record=should_record,
                 **rich_kwargs,
             )
             self.console_options = self.console.options.update(
@@ -88,6 +101,14 @@ class generic_handler_t(lggg.Handler):
             )
 
         self.FormattedLines = self.extension.FormattedLines
+        if self.alternating_lines == 1:
+            self.alternating_lines = 0
+            self.background_is_light = False
+        elif self.alternating_lines == 2:
+            self.alternating_lines = 0
+            self.background_is_light = True
+        else:
+            self.alternating_lines = -1
 
         self.ShowMessage = getattr(
             interface, can_show_message_p.ShowMessage.__name__, interface
@@ -105,8 +126,16 @@ class generic_handler_t(lggg.Handler):
                 richer = Rule(record.msg, DATE_TIME_COLOR)
             else:
                 first, next_s = self.FormattedLines(record, PreProcessed=EscapedForRich)
-                richer = console_rich_handler_t.HighlightedVersion(
-                    first, next_s, record.levelno
+                should_highlight_back = self.alternating_lines == 1
+                if self.alternating_lines >= 0:
+                    self.alternating_lines = (self.alternating_lines + 1) % 2
+                richer = HighlightedVersion(
+                    self.console,
+                    first,
+                    next_s,
+                    record.levelno,
+                    should_highlight_back=should_highlight_back,
+                    background_is_light=self.background_is_light,
                 )
             segments = self.console.render(richer, options=self.console_options)
 

logger_36/handler.py

@@ -38,6 +38,8 @@ def AddGenericHandler(
     message_width: int = -1,
     formatter: lggg.Formatter | None = None,
     supports_html: bool = False,
+    alternating_lines: int = 2,
+    should_record: bool = False,
     should_hold_messages: bool = False,
     **kwargs,
 ) -> None:
@@ -53,6 +55,8 @@ def AddGenericHandler(
         message_width=message_width,
         formatter=formatter,
         supports_html=supports_html,
+        alternating_lines=alternating_lines,
+        should_record=should_record,
         rich_kwargs=kwargs,
         interface=interface,
     )
@@ -94,8 +98,10 @@ def AddRichConsoleHandler(
     show_memory_usage: bool = False,
     message_width: int = -1,
     formatter: lggg.Formatter | None = None,
+    alternating_lines: int = 2,
     should_hold_messages: bool = False,
     should_install_traceback: bool = False,
+    should_record: bool = False,
     **kwargs,
 ) -> None:
     """"""
@@ -111,7 +117,9 @@ def AddRichConsoleHandler(
         additional_s = {}
     else:
         additional_s = {
+            "alternating_lines": alternating_lines,
             "should_install_traceback": should_install_traceback,
+            "should_record": should_record,
             "rich_kwargs": kwargs,
         }
     handler = console_rich_handler_t(

logger_36/task/storage.py

@@ -101,22 +101,20 @@ def SaveLOGasHTML(path: str | path_t | h.TextIO = None) -> None:
         LOGGER.warning(f'{cannot_save}: File "{path}" already exists.')
         return
 
-    console = None
-    found = False
     for handler in LOGGER.handlers:
         console = getattr(handler, "console", None)
-        if found := isinstance(console, console_t):
+        if isinstance(console, console_t) and console.record:
+            html = console.export_html()
+            if actual_file:
+                with open(path, "w") as accessor:
+                    accessor.write(html)
+            else:
+                path.write(html)
             break
-
-    if found:
-        html = console.export_html()
-        if actual_file:
-            with open(path, "w") as accessor:
-                accessor.write(html)
-        else:
-            path.write(html)
     else:
-        LOGGER.warning(f"{cannot_save}: No handler has a RICH console.")
+        LOGGER.warning(
+            f"{cannot_save}: No handler has a RICH console with recording ON."
+        )
 
 
 """

logger_36/type/logger.py

@@ -40,9 +40,10 @@ from logger_36.type.issue import NewIssue, issue_t
 @d.dataclass(slots=True, repr=False, eq=False)
 class logger_t(lggg.Logger):
     name_: d.InitVar[str] = LOGGER_NAME
-    level: d.InitVar[int] = lggg.NOTSET
+    level_: d.InitVar[int] = lggg.NOTSET
     activate_wrn_interceptions: d.InitVar[bool] = True
-    exit_on_error: bool = False
+    exit_on_error: bool = False  # Implies exit_on_critical.
+    exit_on_critical: bool = False
     # Must not be False until at least one handler has been added.
     should_hold_messages: bool = True
 
@@ -58,15 +59,17 @@ class logger_t(lggg.Logger):
     )
 
     def __post_init__(
-        self, name_: str, level: int, activate_wrn_interceptions: bool
+        self, name_: str, level_: int, activate_wrn_interceptions: bool
     ) -> None:
         """"""
         lggg.Logger.__init__(self, name_)
-        self.setLevel(level)
-        self.propagate = False
+        self.setLevel(level_)
+        self.propagate = False  # Part of lggg.Logger.
 
         if activate_wrn_interceptions:
             self._ActivateWarningInterceptions()
+        if self.exit_on_error:
+            self.exit_on_critical = True
 
     def _ActivateWarningInterceptions(self) -> None:
         """
@@ -211,7 +214,11 @@ class logger_t(lggg.Logger):
         else:
             lggg.Logger.handle(self, record)
 
-        if self.exit_on_error and (record.levelno in (lggg.ERROR, lggg.CRITICAL)):
+        if (self.exit_on_critical and (record.levelno is lggg.CRITICAL)) or (
+            self.exit_on_error and (record.levelno is lggg.ERROR)
+        ):
+            # Also works if self.exit_on_error and record.levelno is lggg.CRITICAL since
+            # __post_init__ set self.exit_on_critical if self.exit_on_error.
             sstm.exit(1)
 
     def AddContextLevel(self, new_level: str, /) -> None:

logger_36/version.py

@@ -4,7 +4,7 @@ Contributor(s): Eric Debreuve (eric.debreuve@cnrs.fr) since 2023
 SEE COPYRIGHT NOTICE BELOW
 """
 
-__version__ = "2024.18"
+__version__ = "2024.19"
 
 """
 COPYRIGHT NOTICE

{logger_36-2024.18.dist-info → logger_36-2024.19.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: logger-36
-Version: 2024.18
+Version: 2024.19
 Summary: Simple logger with a catalog of handlers
 Home-page: https://src.koda.cnrs.fr/eric.debreuve/logger-36/
 Author: Eric Debreuve

{logger_36-2024.18.dist-info → logger_36-2024.19.dist-info}/RECORD

@@ -1,16 +1,16 @@
 logger_36/__init__.py,sha256=jHidpp6dmfJVdoiHkwTXBn1_u1HRaZj3BHS8jq71ZOE,2312
 logger_36/format.py,sha256=mox36RRkNUWbeHo3XkGGlik2CoyswDvDehRDtZkrnD0,2558
-logger_36/handler.py,sha256=oDOiZ3Cubg3GwqPw9V8Y5YjjjYAtEZpbLNeTJqcF0lA,6389
+logger_36/handler.py,sha256=wHMj4OyQrUdhAxk_MCvPTBT1Ig3BYpfbqxHYfp91fOU,6697
 logger_36/logger.py,sha256=flRcn5-2L7yGfJusfnkQXzFQcX3Ljt-1_KWnA_I0new,2446
 logger_36/logger_gpu.py,sha256=YYFk6aYQrBDJfxQaDm-ar16T6SlOSL6jJWTOgvpF4EU,2244
 logger_36/measure.py,sha256=P507VNbVKAf4jYGnGX-3rlDrVbrYP0ZD3nxFmAFvhyI,2404
 logger_36/storage.py,sha256=O8pDmiL0B3LJpKrhi8a9IMBXs6MwW6r1bMUn_cSDAaY,2246
-logger_36/version.py,sha256=3G4H0J84ustq7x71CQYkqkC7rXvyvg3fWd6Pz0XWSTY,2206
-logger_36/catalog/config/console_rich.py,sha256=1FWbfJK_DTmnnf1qytJ8O949dh5Bmkjb8MqbkaGN-AY,2718
+logger_36/version.py,sha256=pk3jW0gVcV0DVsZOCeVxbuluEwh3R_zjxpQerFhYt0Q,2206
+logger_36/catalog/config/console_rich.py,sha256=QDkgSs3I7ZULvkd1q4J1hdvgyB857JJcJWxM9fdL51Y,2883
 logger_36/catalog/handler/console.py,sha256=1WLtmxZCBj0AxLu5xey3VIVBKm02bp-Rc-eZOiFtXnU,3893
-logger_36/catalog/handler/console_rich.py,sha256=0qLbG2spohHT9K-mxpUNurSI4ct8o8F3QWI3PweLKtM,7347
+logger_36/catalog/handler/console_rich.py,sha256=v57EFAvCaH5ABoZ24lFn1ObCe_EntHpqzW7RJLs6Lik,8681
 logger_36/catalog/handler/file.py,sha256=GS5nsfp0j0mzPak7vz8E7U4e5H95os_qfDjdM1Ywf0g,4345
-logger_36/catalog/handler/generic.py,sha256=COBZfZ-WqikLvnHVnqwabLoeAhVQrQTHIkMUiYqSJnU,7036
+logger_36/catalog/handler/generic.py,sha256=IwHOE_KhviuJJKCp8-LU86X90Mp0HJO5V5fhiOhfN98,8126
 logger_36/catalog/logger/chronos.py,sha256=eLqQw8N9vaGO23OCf5RrYDPbUeu7epUvDt9rH-dN7i0,2522
 logger_36/catalog/logger/exception.py,sha256=sL7sZ_bjNoof2xgOXvBzAi2xHrj7Pmjfkfhjzuy6NGs,2708
 logger_36/catalog/logger/gpu.py,sha256=vUFSP17e7U4nenMi5IMlDiP3cZvXe6nqEDpoqzTavdg,3490
@@ -33,7 +33,7 @@ logger_36/constant/system.py,sha256=G2mzBTxRXoJMxb53TnmBaceMJC_q3WonoCG7y6nC_R8,
 logger_36/instance/logger.py,sha256=ttKjl9MD7FUjqCWjv5w2hmmpDYxgaORcYf9NaaE9W_M,2246
 logger_36/instance/loggers.py,sha256=RCWpC1NPAf6vXnFc9NqsSALv-x-FEzcH6k_OlxTxeQk,2251
 logger_36/task/inspection.py,sha256=f9VkVrwMJ_ixV9rFu3XUNpmCbEgoo1tssqd2nMeGYLI,5028
-logger_36/task/storage.py,sha256=yxpdAVbN6l4Drn3RFk1ESlKVBYTkliBNgxAR91eGRYs,5646
+logger_36/task/storage.py,sha256=XaSeu-iBCa0N8HNpwCV7cLprj-lbOJocpTIKUgSOvsc,5668
 logger_36/task/format/memory.py,sha256=ECOdHjdxIqXivOwtcmwpLDMYUrutIeOTCn1L4d3-U8k,4241
 logger_36/task/format/message.py,sha256=X9qtXPxhXgCIjnRYBJn93vj4rW4I-7dJP6LaXD5Qu2o,4142
 logger_36/task/format/rule.py,sha256=YEe8wG_QLy9vRZqmT2bWlvKT-Dxp4pGaZVmEuwwODyE,2598
@@ -41,9 +41,9 @@ logger_36/task/measure/chronos.py,sha256=t-y0bVm1SmF-3wI9pR9Bp6-qzVlsE94fZTZr5a_
 logger_36/task/measure/memory.py,sha256=eVw5WOYLyn8o4O4mMArdX2MzsVuhhNDovjYEkk-MIaU,2504
 logger_36/type/handler.py,sha256=BXpevZhLq5V_IdUfi_LZA4czzlH2SGLpgvbqUBe5X10,8311
 logger_36/type/issue.py,sha256=cB8pSSJg9aqFPQ6yJr4TC2kJbngKGK8Hyq4ATBm6jAc,2973
-logger_36/type/logger.py,sha256=TpE8OBS5YvnI6OO-aWwUWnjwEnuGW9toleVQs3pfhnk,14268
+logger_36/type/logger.py,sha256=GaZQQDy6B0_5x2yOrV7r3W9ib7egSRQJCFRE_DpALYw,14669
 logger_36/type/loggers.py,sha256=znqxWBnfQxvkg3VUfbTUvt3S6Kq0DAzWWepxQDt9suI,2871
-logger_36-2024.18.dist-info/METADATA,sha256=eMY6QxYgHHvn7VvWKGpzbfTClaoBU_3NK1XjFpO_Ykw,6276
-logger_36-2024.18.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
-logger_36-2024.18.dist-info/top_level.txt,sha256=sM95BTMWmslEEgR_1pzwZsOeSp8C_QBiu8ImbFr0XLc,10
-logger_36-2024.18.dist-info/RECORD,,
+logger_36-2024.19.dist-info/METADATA,sha256=p3u2INogEHx1jOHYVd6Qja2EmVeA-qe5dM2rcVuOfXc,6276
+logger_36-2024.19.dist-info/WHEEL,sha256=-oYQCr74JF3a37z2nRlQays_SX2MqOANoqVjBBAP2yE,91
+logger_36-2024.19.dist-info/top_level.txt,sha256=sM95BTMWmslEEgR_1pzwZsOeSp8C_QBiu8ImbFr0XLc,10
+logger_36-2024.19.dist-info/RECORD,,

{logger_36-2024.18.dist-info → logger_36-2024.19.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (70.2.0)
+Generator: setuptools (71.0.3)
 Root-Is-Purelib: true
 Tag: py3-none-any