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

logger_36/catalog/handler/console.py

@@ -6,8 +6,10 @@ SEE COPYRIGHT NOTICE BELOW
 
 import dataclasses as d
 import logging as lggg
+import textwrap as text
 import typing as h
 
+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 RuleAsText
 from logger_36.type.handler import handler_extension_t
@@ -57,11 +59,13 @@ class console_handler_t(lggg.Handler):
             message, _ = self.FormattedLines(record, should_join_lines=True)
         print(message)
 
-    def ShowMessage(self, message: str, /) -> None:
+    def ShowMessage(self, message: str, /, *, indented: bool = False) -> None:
         """
         See documentation of
         logger_36.catalog.handler.generic.generic_handler_t.ShowMessage.
         """
+        if indented:
+            message = text.indent(message, LINE_INDENT)
         print(message)
 
 

logger_36/catalog/handler/console_rich.py

@@ -6,6 +6,7 @@ SEE COPYRIGHT NOTICE BELOW
 
 import dataclasses as d
 import logging as lggg
+import textwrap as text
 import typing as h
 
 from logger_36.catalog.config.console_rich import (
@@ -25,12 +26,13 @@ from logger_36.config.message import (
     LEVEL_CLOSING,
     WHERE_SEPARATOR,
 )
-from logger_36.constant.message import TIME_LENGTH
+from logger_36.constant.message import LINE_INDENT, TIME_LENGTH
 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
 from rich.console import Console as console_t
 from rich.console import RenderableType as renderable_t
+from rich.markup import escape as EscapedVersion
 from rich.text import Text as text_t
 from rich.traceback import install as InstallTracebackHandler
 
@@ -139,7 +141,7 @@ class console_rich_handler_t(lggg.Handler):
         if hasattr(record, SHOW_W_RULE_ATTR):
             richer = Rule(record.msg, DATE_TIME_COLOR)
         else:
-            first, next_s = self.FormattedLines(record)
+            first, next_s = self.FormattedLines(record, PreProcessed=EscapedVersion)
             should_highlight_back = self.alternating_lines == 1
             if self.alternating_lines >= 0:
                 self.alternating_lines = (self.alternating_lines + 1) % 2
@@ -153,11 +155,13 @@ class console_rich_handler_t(lggg.Handler):
             )
         self.console.print(richer, crop=False, overflow="ignore")
 
-    def ShowMessage(self, message: str, /) -> None:
+    def ShowMessage(self, message: str, /, *, indented: bool = False) -> None:
         """
         See documentation of
         logger_36.catalog.handler.generic.generic_handler_t.ShowMessage.
         """
+        if indented:
+            message = text.indent(message, LINE_INDENT)
         self.console.print(message, crop=False, overflow="ignore")
 
 
@@ -172,9 +176,7 @@ def HighlightedVersion(
     background_is_light: bool = True,
 ) -> renderable_t:
     """"""
-    # TODO: Is there a way to use html or something to enable message styling,
-    #     regardless of the handler (would require styling conversion; html->rich here).
-    output = text_t.from_markup(first_line)
+    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.
@@ -194,7 +196,7 @@ def HighlightedVersion(
     output.stylize(ELAPSED_TIME_COLOR, start=elapsed_time_separator)
 
     if next_lines is not None:
-        output.append(text_t.from_markup(next_lines))
+        output.append(next_lines)
 
     _ = output.highlight_regex(ACTUAL_PATTERNS, style=ACTUAL_COLOR)
     _ = output.highlight_regex(EXPECTED_PATTERNS, style=EXPECTED_COLOR)

logger_36/catalog/handler/file.py

@@ -6,9 +6,11 @@ SEE COPYRIGHT NOTICE BELOW
 
 import dataclasses as d
 import logging as lggg
+import textwrap as text
 import typing as h
 from pathlib import Path as path_t
 
+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 RuleAsText
 from logger_36.type.handler import handler_extension_t
@@ -67,11 +69,13 @@ class file_handler_t(lggg.FileHandler):
         print(message, file=self.stream)
         self.stream.flush()
 
-    def ShowMessage(self, message: str, /) -> None:
+    def ShowMessage(self, message: str, /, *, indented: bool = False) -> None:
         """
         See documentation of
         logger_36.catalog.handler.generic.generic_handler_t.ShowMessage.
         """
+        if indented:
+            message = text.indent(message, LINE_INDENT)
         print(message, file=self.stream)
         self.stream.flush()
 

logger_36/constant/message.py

@@ -17,7 +17,8 @@ from logger_36.config.message import (
 TIME_LENGTH = time.strftime(TIME_FORMAT, time.gmtime(0)).__len__()
 LOG_LEVEL_LENGTH = 1 + LEVEL_OPENING.__len__() + LEVEL_CLOSING.__len__()
 CONTEXT_LENGTH = TIME_LENGTH + LOG_LEVEL_LENGTH
-NEXT_LINE_PROLOGUE = "\n" + (CONTEXT_LENGTH + MESSAGE_MARKER.__len__() + 1) * " "
+LINE_INDENT = (CONTEXT_LENGTH + MESSAGE_MARKER.__len__() + 1) * " "
+NEXT_LINE_PROLOGUE = "\n" + LINE_INDENT
 
 expected_op_h = h.Literal[":", ": ", "=", "!=", ">=", "<="]
 EXPECTED_OP: tuple[str, ...] = h.get_args(expected_op_h)

logger_36/content.py

@@ -4,6 +4,7 @@ Contributor(s): Eric Debreuve (eric.debreuve@cnrs.fr) since 2023
 SEE COPYRIGHT NOTICE BELOW
 """
 
+from logger_36.constant.message import LINE_INDENT
 from logger_36.task.format.message import FormattedMessage
 from logger_36.task.format.rule import Rule, RuleAsText
 

logger_36/type/logger.py

@@ -280,7 +280,7 @@ class logger_t(lggg.Logger):
             message = f"{type(exception).__name__}:\n{formatted}"
         self.log(level, message)
 
-    def ShowMessage(self, message: str, /) -> None:
+    def ShowMessage(self, message: str, /, *, indented: bool = False) -> None:
         """
         See documentation of
         logger_36.catalog.handler.generic.generic_handler_t.ShowMessage.
@@ -288,7 +288,7 @@ class logger_t(lggg.Logger):
         for handler in self.handlers:
             ShowMessage = getattr(handler, "ShowMessage", None)
             if ShowMessage is not None:
-                ShowMessage(message)
+                ShowMessage(message, indented=indented)
 
     def DisplayRule(self, /, *, text: str | None = None, color: str = "white") -> 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.25"
+__version__ = "2024.26"
 
 """
 COPYRIGHT NOTICE

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

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

@@ -1,5 +1,5 @@
 logger_36/__init__.py,sha256=NtDTs3eMKaXTJeujmgj1um3cBVLti0tYuOsdtVk9o9Q,2269
-logger_36/content.py,sha256=bcMHw_HWJeolnP7KcKREpWbSy9IqWO44beBrisdgeQo,2297
+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
@@ -7,13 +7,13 @@ 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=C_q5mLo__HXHHvcfHIjNc1a_cFQMKdfy8MRQmswsFq8,2206
+logger_36/version.py,sha256=aWIezgzKk1mCAVZR34AWQke-WZ-Cj33kdeWtA-fe7SU,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=SF9S3CUoEPp5dh7RrqotywDJjMgRp0rD9sO3eLVXnkA,4004
-logger_36/catalog/handler/console_rich.py,sha256=uLZzVURQ6OIUuQEGMc142vJkEyxBbE0-HJJGQ_zOJcI,8914
-logger_36/catalog/handler/file.py,sha256=z5ovaOxemh61pbWDCK2sMMlbd1TKwGjMiQhgoicilm4,4456
+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/logger/chronos.py,sha256=eLqQw8N9vaGO23OCf5RrYDPbUeu7epUvDt9rH-dN7i0,2522
 logger_36/catalog/logger/gpu.py,sha256=vUFSP17e7U4nenMi5IMlDiP3cZvXe6nqEDpoqzTavdg,3490
@@ -30,7 +30,7 @@ logger_36/constant/handler.py,sha256=HM8qCSEMGNMCzddjUUNBPGL-3d0qU-EmG5eW4ZQHW6A
 logger_36/constant/issue.py,sha256=01l8itRPWGS5F6gXtsXUJgGR-4lS1Eu3_YeKC-khKLw,2315
 logger_36/constant/logger.py,sha256=0GhemAQ_YBiRO5WQBuNTczuejyVu2IYCsgqPRIbL8es,2780
 logger_36/constant/memory.py,sha256=ZL1MwbdtNsrCrOwzEyfTsfOoOsRBTJtbbf3otHGnxXo,2343
-logger_36/constant/message.py,sha256=JMnCmW4j-oa-Cs1iZCJ5yAG6V4BzjLCGRIvEw6pQTtU,2719
+logger_36/constant/message.py,sha256=u7VH3mj_oW0W33UBIVVzZN1L7iQf4XW0BBr72w6y7bw,2745
 logger_36/constant/record.py,sha256=zebZYR4buX1lGfc7IyuvEh8zOpk7hx0aS4pJ12H0flI,2311
 logger_36/constant/system.py,sha256=G2mzBTxRXoJMxb53TnmBaceMJC_q3WonoCG7y6nC_R8,2430
 logger_36/instance/logger.py,sha256=ttKjl9MD7FUjqCWjv5w2hmmpDYxgaORcYf9NaaE9W_M,2246
@@ -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=EM_wtwPSZW4pTvbHma1q2xXjhUpAa6Af67qBNt8Sq4Q,17386
+logger_36/type/logger.py,sha256=J08I5sw7Lr2bEDJo2aJc5b4LgTvU_5O4RCDoBnqsSEw,17432
 logger_36/type/loggers.py,sha256=znqxWBnfQxvkg3VUfbTUvt3S6Kq0DAzWWepxQDt9suI,2871
-logger_36-2024.25.dist-info/METADATA,sha256=YgnEX7JnJeAoOseRKRuJtd2VRyDOJuUXy-Ovel_ywc0,6276
-logger_36-2024.25.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-logger_36-2024.25.dist-info/top_level.txt,sha256=sM95BTMWmslEEgR_1pzwZsOeSp8C_QBiu8ImbFr0XLc,10
-logger_36-2024.25.dist-info/RECORD,,
+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,,