logger-36 2024.26__py3-none-any.whl → 2024.28__py3-none-any.whl

logger_36/catalog/config/console_rich.py

@@ -12,23 +12,24 @@ from rich.style import Style as style_t
 """
 Colors: See https://rich.readthedocs.io/en/stable/appendix/colors.html.
 """
-DATE_TIME_COLOR = "dodger_blue2"
+WHITE_COLOR = "grey85"
+GRAY_COLOR = "grey58"
+
 LEVEL_COLOR: dict[int, str | style_t] = {
     lggg.DEBUG: "orchid",
-    lggg.INFO: "white",
-    lggg.WARNING: "yellow",
-    lggg.ERROR: "orange1",
-    lggg.CRITICAL: "red",
+    lggg.INFO: GRAY_COLOR,
+    lggg.WARNING: "yellow1",
+    lggg.ERROR: "dark_orange",
+    lggg.CRITICAL: "bright_red",
 }
-ACTUAL_COLOR = "indian_red"
-EXPECTED_COLOR = "green"
-ELAPSED_TIME_COLOR = "green"
+ACTUAL_COLOR = LEVEL_COLOR[lggg.CRITICAL]
+EXPECTED_COLOR = "green3"
+DATE_TIME_COLOR = "sky_blue3"
+ELAPSED_TIME_COLOR = DATE_TIME_COLOR
 
 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))
-
 """
 COPYRIGHT NOTICE
 

logger_36/catalog/handler/console.py

@@ -6,7 +6,7 @@ SEE COPYRIGHT NOTICE BELOW
 
 import dataclasses as d
 import logging as lggg
-import textwrap as text
+import textwrap as txt_
 import typing as h
 
 from logger_36.constant.message import LINE_INDENT
@@ -65,9 +65,13 @@ class console_handler_t(lggg.Handler):
         logger_36.catalog.handler.generic.generic_handler_t.ShowMessage.
         """
         if indented:
-            message = text.indent(message, LINE_INDENT)
+            message = txt_.indent(message, LINE_INDENT)
         print(message)
 
+    def DisplayRule(self, /, *, text: str | None = None, color: str = "white") -> None:
+        """"""
+        self.ShowMessage(RuleAsText(text))
+
 
 """
 COPYRIGHT NOTICE

logger_36/catalog/handler/console_rich.py

@@ -6,7 +6,7 @@ SEE COPYRIGHT NOTICE BELOW
 
 import dataclasses as d
 import logging as lggg
-import textwrap as text
+import textwrap as txt_
 import typing as h
 
 from logger_36.catalog.config.console_rich import (
@@ -16,8 +16,9 @@ from logger_36.catalog.config.console_rich import (
     DATE_TIME_COLOR,
     ELAPSED_TIME_COLOR,
     EXPECTED_COLOR,
-    GRAY_STYLE,
+    GRAY_COLOR,
     LEVEL_COLOR,
+    WHITE_COLOR,
 )
 from logger_36.config.message import (
     ACTUAL_PATTERNS,
@@ -26,7 +27,7 @@ from logger_36.config.message import (
     LEVEL_CLOSING,
     WHERE_SEPARATOR,
 )
-from logger_36.constant.message import LINE_INDENT, TIME_LENGTH
+from logger_36.constant.message import LINE_INDENT
 from logger_36.constant.record import SHOW_W_RULE_ATTR
 from logger_36.task.format.rule import Rule
 from logger_36.type.handler import handler_extension_t
@@ -161,9 +162,13 @@ class console_rich_handler_t(lggg.Handler):
         logger_36.catalog.handler.generic.generic_handler_t.ShowMessage.
         """
         if indented:
-            message = text.indent(message, LINE_INDENT)
+            message = txt_.indent(message, LINE_INDENT)
         self.console.print(message, crop=False, overflow="ignore")
 
+    def DisplayRule(self, /, *, text: str | None = None, color: str = "white") -> None:
+        """"""
+        self.ShowMessage(Rule(text, color))
+
 
 def HighlightedVersion(
     _: console_t,
@@ -176,7 +181,7 @@ def HighlightedVersion(
     background_is_light: bool = True,
 ) -> renderable_t:
     """"""
-    output = text_t(first_line)
+    output = text_t(first_line, WHITE_COLOR)
 
     # Used instead of _CONTEXT_LENGTH which might include \t, thus creating a
     # mismatch between character length and length when displayed in console.
@@ -186,13 +191,8 @@ def HighlightedVersion(
         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(LEVEL_COLOR[log_level], end=context_end + 1)
+    output.stylize(GRAY_COLOR, start=where_separator, end=elapsed_time_separator)
     output.stylize(ELAPSED_TIME_COLOR, start=elapsed_time_separator)
 
     if next_lines is not None:

logger_36/catalog/handler/file.py

@@ -6,7 +6,7 @@ SEE COPYRIGHT NOTICE BELOW
 
 import dataclasses as d
 import logging as lggg
-import textwrap as text
+import textwrap as txt_
 import typing as h
 from pathlib import Path as path_t
 
@@ -75,10 +75,14 @@ class file_handler_t(lggg.FileHandler):
         logger_36.catalog.handler.generic.generic_handler_t.ShowMessage.
         """
         if indented:
-            message = text.indent(message, LINE_INDENT)
+            message = txt_.indent(message, LINE_INDENT)
         print(message, file=self.stream)
         self.stream.flush()
 
+    def DisplayRule(self, /, *, text: str | None = None, color: str = "white") -> None:
+        """"""
+        self.ShowMessage(RuleAsText(text))
+
 
 """
 COPYRIGHT NOTICE

logger_36/catalog/handler/generic.py

@@ -23,6 +23,14 @@ from logger_36.task.format.rule import Rule, RuleAsText
 from logger_36.type.handler import handler_extension_t
 
 
+class show_message_p(h.Protocol):
+    def __call__(self, message: str, /, *, indented: bool = False) -> None: ...
+
+
+class display_rule_p(h.Protocol):
+    def __call__(self, /, *, text: str | None = None, color: str = "white") -> None: ...
+
+
 @d.dataclass(slots=True, repr=False, eq=False)
 class generic_handler_t(lggg.Handler):
     """
@@ -44,12 +52,13 @@ class generic_handler_t(lggg.Handler):
         it is indeed called at the end of the emit method.
     """
 
-    ShowMessage: h.Callable[[str], None]
-    console: console_t = None
-    console_options: console_options_t = None
+    ShowMessage: show_message_p
+    console: console_t | None = None
+    console_options: console_options_t | None = None
     alternating_lines: int = 0
     background_is_light: bool = True
 
+    DisplayRule: display_rule_p = d.field(init=False)
     extension: handler_extension_t = d.field(init=False)
     FormattedLines: h.Callable[..., tuple[str, str | None]] = d.field(init=False)
 
@@ -101,6 +110,9 @@ class generic_handler_t(lggg.Handler):
             self.console_options = self.console.options.update(
                 overflow="ignore", no_wrap=True
             )
+            self.DisplayRule = self._DisplayRule
+        else:
+            self.DisplayRule = self._DisplayRuleAsText
 
         self.FormattedLines = self.extension.FormattedLines
         if self.alternating_lines == 1:
@@ -161,6 +173,16 @@ class generic_handler_t(lggg.Handler):
 
         self.ShowMessage(message)
 
+    def _DisplayRuleAsText(
+        self, /, *, text: str | None = None, color: str = "white"
+    ) -> None:
+        """"""
+        self.ShowMessage(RuleAsText(text))
+
+    def _DisplayRule(self, /, *, text: str | None = None, color: str = "white") -> None:
+        """"""
+        self.ShowMessage(Rule(text, color))
+
 
 """
 COPYRIGHT NOTICE

logger_36/handler.py

@@ -6,12 +6,11 @@ SEE COPYRIGHT NOTICE BELOW
 
 import logging as lggg
 import sys as sstm
-import typing as h
 from pathlib import Path as path_t
 
 from logger_36.catalog.handler.console import console_handler_t
 from logger_36.catalog.handler.file import file_handler_t
-from logger_36.catalog.handler.generic import generic_handler_t
+from logger_36.catalog.handler.generic import generic_handler_t, show_message_p
 from logger_36.constant.error import MISSING_RICH_ERROR
 from logger_36.instance.logger import LOGGER
 
@@ -28,7 +27,7 @@ except ModuleNotFoundError:
 
 
 def AddGenericHandler(
-    ShowMessage: h.Callable[[str], None],
+    ShowMessage: show_message_p,
     /,
     *,
     logger: lggg.Logger | None = None,

logger_36/type/logger.py

@@ -32,7 +32,6 @@ from logger_36.task.format.memory import (
     FormattedUsageWithAutoUnit as FormattedMemoryUsage,
 )
 from logger_36.task.format.message import FormattedMessage
-from logger_36.task.format.rule import Rule
 from logger_36.task.measure.chronos import ElapsedTime
 from logger_36.task.measure.memory import CurrentUsage as CurrentMemoryUsage
 from logger_36.type.issue import NewIssue, issue_t
@@ -292,7 +291,10 @@ class logger_t(lggg.Logger):
 
     def DisplayRule(self, /, *, text: str | None = None, color: str = "white") -> None:
         """"""
-        self.ShowMessage(Rule(text, color))
+        for handler in self.handlers:
+            DisplayRule = getattr(handler, "DisplayRule", None)
+            if DisplayRule is not None:
+                DisplayRule(text=text, color=color)
 
     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.26"
+__version__ = "2024.28"
 
 """
 COPYRIGHT NOTICE

{logger_36-2024.26.dist-info → logger_36-2024.28.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: logger-36
-Version: 2024.26
+Version: 2024.28
 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.26.dist-info → logger_36-2024.28.dist-info}/RECORD

@@ -2,19 +2,19 @@ logger_36/__init__.py,sha256=NtDTs3eMKaXTJeujmgj1um3cBVLti0tYuOsdtVk9o9Q,2269
 logger_36/content.py,sha256=jobWhMw249uLfi8d8RFpKQRyyMXD7YQg-DxPMqvj2xs,2348
 logger_36/exception.py,sha256=UsFcsAvd1L4aLj6h7T-DilDm6yO501HDYnGekibiMAU,3260
 logger_36/gpu.py,sha256=YYFk6aYQrBDJfxQaDm-ar16T6SlOSL6jJWTOgvpF4EU,2244
-logger_36/handler.py,sha256=9KUu02RpKGKBR358gqS5G1Zut5C6MyBgGzRsQYFBAtY,6721
+logger_36/handler.py,sha256=SmE2QdHfpef9w4uSW1Kj0WHRnpfGa6G2up0tNK-nCrc,6709
 logger_36/memory.py,sha256=FTc3qCeMqnCNvHJ4Yds73noPENQx_U1MYB-R4LLUjVQ,2682
 logger_36/storage.py,sha256=TNfIXEfHcjixv75wocUyqwX62iDYsor4srRqC3FNzbc,2231
 logger_36/system.py,sha256=xzm6cMeTaCX9VX9ZRXUXgfqoT9oUtv3W2o_H2W0P-4Q,2243
 logger_36/time.py,sha256=_CtpQeUZdsUNGNfwzhoWUiUvawRgmonqwZPHouzWf5M,2308
-logger_36/version.py,sha256=aWIezgzKk1mCAVZR34AWQke-WZ-Cj33kdeWtA-fe7SU,2206
+logger_36/version.py,sha256=6RZEHyBy6_xJn0rt_KwQysU6A37xbsTsQ4Nn3DpDz34,2206
 logger_36/api/logger.py,sha256=Wg2nzQeuRVZ4v-oy3Q2KdYsHSzF9v7a0Fk6BzLnbkYw,2225
 logger_36/api/storage.py,sha256=evKVqIsslA5X82LaZ2HQDxp7ltyNOn8Tr-3-Pic3eUo,2231
-logger_36/catalog/config/console_rich.py,sha256=QDkgSs3I7ZULvkd1q4J1hdvgyB857JJcJWxM9fdL51Y,2883
-logger_36/catalog/handler/console.py,sha256=gSNFCoKfTFg7ID8lJjlbZuVi-4C5j-eQX1q_vllXL9s,4183
-logger_36/catalog/handler/console_rich.py,sha256=gxh1Ud33SkfFnLs9lRD8mP18wDxJ_18q7YxUP0aVZao,8933
-logger_36/catalog/handler/file.py,sha256=YBl0-1jBn4W0fm_WYg9zMHwFU9DRaDKOBQsLGle_BSs,4635
-logger_36/catalog/handler/generic.py,sha256=wG6Z1-lHj_9o6cPurEVpPctFlec3BFeqx2mZU_krJt8,8379
+logger_36/catalog/config/console_rich.py,sha256=TUEvXlWmoB0t5TIkI77s2G_gyM6yEf8JiuRoL1Gx4KA,2903
+logger_36/catalog/handler/console.py,sha256=WN_6kEJIVCkfdG-h_I3Jntklsn2FIolpkRltoHQRetY,4330
+logger_36/catalog/handler/console_rich.py,sha256=XIhxhFyWExZAfhhDMfH4qerV5idsXS78ZDt50Y2CmhI,8995
+logger_36/catalog/handler/file.py,sha256=oY5ib9L8tppdeQOPnQUrAXy1dgoSvMreHZiE5RhQl9o,4782
+logger_36/catalog/handler/generic.py,sha256=CqDl7ynTB2rGIJDa8vXFq64Kf4W7D85miV_p8mj0-8Q,9114
 logger_36/catalog/logger/chronos.py,sha256=eLqQw8N9vaGO23OCf5RrYDPbUeu7epUvDt9rH-dN7i0,2522
 logger_36/catalog/logger/gpu.py,sha256=vUFSP17e7U4nenMi5IMlDiP3cZvXe6nqEDpoqzTavdg,3490
 logger_36/catalog/logger/memory.py,sha256=Zel_UCnHqGAqf_YuKpvjt0OIOo9vwKYpFM9g_2bjir0,4790
@@ -44,9 +44,9 @@ logger_36/task/measure/chronos.py,sha256=PX7dESj0znstwAWW2tTQ5gcQuIlexzt1ZKcccyp
 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=Y7OCLCzVt6Yvkecwj8HXLdZjg33oMxexc9XkYHzUhh4,3202
-logger_36/type/logger.py,sha256=J08I5sw7Lr2bEDJo2aJc5b4LgTvU_5O4RCDoBnqsSEw,17432
+logger_36/type/logger.py,sha256=iYDV5cEVE8Yb5DjnV74K8r5M16iK07Pf4u8mb8XszEo,17538
 logger_36/type/loggers.py,sha256=znqxWBnfQxvkg3VUfbTUvt3S6Kq0DAzWWepxQDt9suI,2871
-logger_36-2024.26.dist-info/METADATA,sha256=kL7MjQ1ERnbMmk2sz3BkSgMwTOMwn1v9WiQqjG3__GU,6276
-logger_36-2024.26.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-logger_36-2024.26.dist-info/top_level.txt,sha256=sM95BTMWmslEEgR_1pzwZsOeSp8C_QBiu8ImbFr0XLc,10
-logger_36-2024.26.dist-info/RECORD,,
+logger_36-2024.28.dist-info/METADATA,sha256=J9DLOQjTdAnHyPvtHMf8JXWuXvcNvdQFfToy99vK2ss,6276
+logger_36-2024.28.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+logger_36-2024.28.dist-info/top_level.txt,sha256=sM95BTMWmslEEgR_1pzwZsOeSp8C_QBiu8ImbFr0XLc,10
+logger_36-2024.28.dist-info/RECORD,,