logger-36 2024.11__py3-none-any.whl → 2024.13__py3-none-any.whl

logger_36/catalog/handler/console.py

@@ -47,6 +47,7 @@ class console_handler_t(lggg.Handler):
     level: dtcl.InitVar[int] = lggg.NOTSET
     show_where: dtcl.InitVar[bool] = True
     show_memory_usage: dtcl.InitVar[bool] = False
+    message_width: dtcl.InitVar[int] = -1
     formatter: dtcl.InitVar[lggg.Formatter | None] = None
 
     def __post_init__(
@@ -55,6 +56,7 @@ class console_handler_t(lggg.Handler):
         level: int,
         show_where: bool,
         show_memory_usage: bool,
+        message_width: int,
         formatter: lggg.Formatter | None,
     ) -> None:
         """"""
@@ -66,6 +68,7 @@ class console_handler_t(lggg.Handler):
             show_memory_usage=show_memory_usage,
             handler=self,
             level=level,
+            message_width=message_width,
             formatter=formatter,
         )
 

logger_36/catalog/handler/console_rich.py

@@ -82,6 +82,7 @@ class console_rich_handler_t(lggg.Handler):
     level: dtcl.InitVar[int] = lggg.NOTSET
     show_where: dtcl.InitVar[bool] = True
     show_memory_usage: dtcl.InitVar[bool] = False
+    message_width: dtcl.InitVar[int] = -1
     formatter: dtcl.InitVar[lggg.Formatter | None] = None
     should_install_traceback: dtcl.InitVar[bool] = False
 
@@ -93,6 +94,7 @@ class console_rich_handler_t(lggg.Handler):
         level: int,
         show_where: bool,
         show_memory_usage: bool,
+        message_width: int,
         formatter: lggg.Formatter | None,
         should_install_traceback: bool,
         rich_kwargs: dict[str, h.Any] | None,
@@ -106,6 +108,7 @@ class console_rich_handler_t(lggg.Handler):
             show_memory_usage=show_memory_usage,
             handler=self,
             level=level,
+            message_width=message_width,
             formatter=formatter,
         )
 

logger_36/catalog/handler/file.py

@@ -49,6 +49,7 @@ class file_handler_t(lggg.FileHandler):
     level: dtcl.InitVar[int] = lggg.NOTSET
     show_where: dtcl.InitVar[bool] = True
     show_memory_usage: dtcl.InitVar[bool] = False
+    message_width: dtcl.InitVar[int] = -1
     formatter: dtcl.InitVar[lggg.Formatter | None] = None
 
     path: dtcl.InitVar[path_t | None] = None
@@ -61,6 +62,7 @@ class file_handler_t(lggg.FileHandler):
         level: int,
         show_where: bool,
         show_memory_usage: bool,
+        message_width: int,
         formatter: lggg.Formatter | None,
         path: path_t | None,
         handler_args: tuple[h.Any],
@@ -75,6 +77,7 @@ class file_handler_t(lggg.FileHandler):
             show_memory_usage=show_memory_usage,
             handler=self,
             level=level,
+            message_width=message_width,
             formatter=formatter,
         )
 

logger_36/catalog/handler/generic.py

@@ -37,6 +37,7 @@ from logger_36.catalog.config.console_rich import DATE_TIME_COLOR
 
 try:
     from rich.console import Console as console_t
+    from rich.console import ConsoleOptions as console_options_t
     from rich.markup import escape as EscapedForRich
     from rich.terminal_theme import DEFAULT_TERMINAL_THEME
 except ModuleNotFoundError:
@@ -60,6 +61,7 @@ class generic_handler_t(lggg.Handler):
 
     extension: handler_extension_t = dtcl.field(init=False)
     console: console_t | None = None
+    console_options: console_options_t | None = None
     FormattedLines: h.Callable[..., tuple[str, str | None]] = dtcl.field(init=False)
     ShowMessage: h.Callable[[str], None] = lambda _arg: None
 
@@ -67,6 +69,7 @@ class generic_handler_t(lggg.Handler):
     level: dtcl.InitVar[int] = lggg.NOTSET
     show_where: dtcl.InitVar[bool] = True
     show_memory_usage: dtcl.InitVar[bool] = False
+    message_width: dtcl.InitVar[int] = -1
     formatter: dtcl.InitVar[lggg.Formatter | None] = None
 
     supports_html: dtcl.InitVar[bool] = False
@@ -79,6 +82,7 @@ class generic_handler_t(lggg.Handler):
         level: int,
         show_where: bool,
         show_memory_usage: bool,
+        message_width: int,
         formatter: lggg.Formatter | None,
         supports_html: bool,
         rich_kwargs: dict[str, h.Any] | None,
@@ -93,6 +97,7 @@ class generic_handler_t(lggg.Handler):
             show_memory_usage=show_memory_usage,
             handler=self,
             level=level,
+            message_width=message_width,
             formatter=formatter,
         )
 
@@ -104,6 +109,9 @@ class generic_handler_t(lggg.Handler):
                 force_terminal=True,
                 **rich_kwargs,
             )
+            self.console_options = self.console.options.update(
+                overflow="ignore", no_wrap=True
+            )
 
         self.FormattedLines = self.extension.FormattedLines
 
@@ -126,7 +134,7 @@ class generic_handler_t(lggg.Handler):
                 richer = console_rich_handler_t.HighlightedVersion(
                     first, next_s, record.levelno
                 )
-            segments = self.console.render(richer)
+            segments = self.console.render(richer, options=self.console_options)
 
             # Inspired from the code of: rich.console.export_html.
             html_segments = []

logger_36/config/message.py

@@ -36,8 +36,6 @@ WHERE_SEPARATOR = "@"
 ELAPSED_TIME_SEPARATOR = "+"
 MEMORY_SEPARATOR = ":"
 
-INTERCEPTED_LOG_SEPARATOR = " >>> "
-
 DATE_FORMAT = "%Y-%m-%d"
 TIME_FORMAT = "%H:%M:%S"
 WHERE_FORMAT = f" {WHERE_SEPARATOR} {{module}}:{{funcName}}:{{lineno}}"

logger_36/main.py

@@ -62,6 +62,7 @@ def AddGenericHandler(
     level: int = lggg.INFO,
     show_where: bool = True,
     show_memory_usage: bool = False,
+    message_width: int = -1,
     formatter: lggg.Formatter | None = None,
     supports_html: bool = False,
     should_hold_messages: bool = False,
@@ -76,6 +77,7 @@ def AddGenericHandler(
         level=level,
         show_where=show_where,
         show_memory_usage=show_memory_usage,
+        message_width=message_width,
         formatter=formatter,
         supports_html=supports_html,
         rich_kwargs=kwargs,
@@ -91,6 +93,7 @@ def AddConsoleHandler(
     level: int = lggg.INFO,
     show_where: bool = True,
     show_memory_usage: bool = False,
+    message_width: int = -1,
     formatter: lggg.Formatter | None = None,
     should_hold_messages: bool = False,
 ) -> None:
@@ -103,6 +106,7 @@ def AddConsoleHandler(
         level=level,
         show_where=show_where,
         show_memory_usage=show_memory_usage,
+        message_width=message_width,
         formatter=formatter,
     )
     logger.AddHandler(handler, should_hold_messages)
@@ -115,6 +119,7 @@ def AddRichConsoleHandler(
     level: int = lggg.INFO,
     show_where: bool = True,
     show_memory_usage: bool = False,
+    message_width: int = -1,
     formatter: lggg.Formatter | None = None,
     should_hold_messages: bool = False,
     should_install_traceback: bool = False,
@@ -134,6 +139,7 @@ def AddRichConsoleHandler(
         level=level,
         show_where=show_where,
         show_memory_usage=show_memory_usage,
+        message_width=message_width,
         formatter=formatter,
         should_install_traceback=should_install_traceback,
         rich_kwargs=kwargs,
@@ -150,6 +156,7 @@ def AddFileHandler(
     level: int = lggg.INFO,
     show_where: bool = True,
     show_memory_usage: bool = False,
+    message_width: int = -1,
     formatter: lggg.Formatter | None = None,
     should_hold_messages: bool = False,
     **kwargs,
@@ -167,6 +174,7 @@ def AddFileHandler(
         level=level,
         show_where=show_where,
         show_memory_usage=show_memory_usage,
+        message_width=message_width,
         formatter=formatter,
         path=path,
         handler_args=args,

logger_36/type/extension.py

@@ -53,6 +53,7 @@ class handler_extension_t:
     name: str | None = None
     show_where: bool = True
     show_memory_usage: bool = False
+    message_width: int = -1
     FormattedRecord: h.Callable[[lggg.LogRecord], str] = dtcl.field(init=False)
 
     handler: dtcl.InitVar[lggg.Handler | None] = None
@@ -85,6 +86,8 @@ class handler_extension_t:
 
         handler.setLevel(level)
 
+        if 0 < self.message_width < 5:
+            self.message_width = 5
         if formatter is None:
             message_format = MessageFormat(self.show_where, self.show_memory_usage)
             formatter = lggg.Formatter(fmt=message_format, datefmt=TIME_FORMAT)
@@ -111,13 +114,26 @@ class handler_extension_t:
 
         if PreProcessed is not None:
             message = PreProcessed(message)
-        if "\n" in message:
-            lines = message.splitlines()
+        if (has_newlines := ("\n" in message)) or (
+            (self.message_width > 0) and (message.__len__() > self.message_width)
+        ):
+            if has_newlines:
+                lines = message.splitlines()
+                if self.message_width > 0:
+                    lines = _WrappedLines(lines, self.message_width)
+            else:
+                lines = _WrappedLines([message], self.message_width)
             next_lines = NEXT_LINE_PROLOGUE.join(lines[1:])
             next_lines = f"{NEXT_LINE_PROLOGUE}{next_lines}"
             message = lines[0]
         else:
             next_lines = None
+        if self.message_width > 0:
+            n_missing_s = self.message_width - message.__len__()
+            if n_missing_s > 3:
+                message += " " + (n_missing_s - 1) * "."
+            elif n_missing_s > 0:
+                message += n_missing_s * " "
 
         record.msg = message
         if self.show_where and not hasattr(record, SHOW_WHERE_ATTR):
@@ -152,3 +168,34 @@ class handler_extension_t:
                 return f"{first_line}{next_lines}", None
         else:
             return first_line, next_lines
+
+
+def _WrappedLines(lines: list[str], message_width: int, /) -> list[str]:
+    """"""
+    output = []
+
+    for line in lines:
+        while line.__len__() > message_width:
+            if all(
+                _elm != " " for _elm in line[(message_width - 1) : (message_width + 1)]
+            ):
+                if line[message_width - 2] == " ":
+                    piece, line = (
+                        line[: (message_width - 2)].rstrip(),
+                        line[(message_width - 1) :],
+                    )
+                else:
+                    piece, line = (
+                        line[: (message_width - 1)] + "-",
+                        line[(message_width - 1) :],
+                    )
+            else:
+                piece, line = (
+                    line[:message_width].rstrip(),
+                    line[message_width:].lstrip(),
+                )
+            output.append(piece)
+
+        output.append(line)
+
+    return output

logger_36/type/logger.py

@@ -42,7 +42,7 @@ from pathlib import Path as path_t
 from traceback import TracebackException as traceback_t
 
 from logger_36.config.issue import ISSUE_CONTEXT_END, ISSUE_CONTEXT_SEPARATOR
-from logger_36.config.message import DATE_FORMAT, INTERCEPTED_LOG_SEPARATOR
+from logger_36.config.message import DATE_FORMAT
 from logger_36.constant.generic import NOT_PASSED
 from logger_36.constant.issue import ORDER, order_h
 from logger_36.constant.logger import (
@@ -65,13 +65,12 @@ from logger_36.type.issue import NewIssue, issue_t
 
 @dtcl.dataclass(slots=True, repr=False, eq=False)
 class logger_t(lggg.Logger):
-    # Must not be False until at least one handler has been added.
-    should_hold_messages: bool = True
-
     name: dtcl.InitVar[str] = LOGGER_NAME
     level: dtcl.InitVar[int] = lggg.NOTSET
     activate_wrn_interceptions: dtcl.InitVar[bool] = True
     exit_on_error: bool = False
+    # Must not be False until at least one handler has been added.
+    should_hold_messages: bool = True
 
     on_hold: list[lggg.LogRecord] = dtcl.field(init=False, default_factory=list)
     last_message_date: str = dtcl.field(init=False, default="")
@@ -221,7 +220,7 @@ class logger_t(lggg.Logger):
         date = dttm.now().strftime(DATE_FORMAT)
         if date != self.last_message_date:
             self.last_message_date = date
-            # levelno: Added for management by lggg.Logger.handle.
+            # levelno: Added for management by logging.Logger.handle.
             date_record = lggg.makeLogRecord(
                 {
                     "name": self.name,
@@ -368,7 +367,7 @@ def _HandleForInterceptions(
 
     def handle_p(_: lggg.Logger, record: lggg.LogRecord, /) -> None:
         duplicate = lggg.makeLogRecord(record.__dict__)
-        duplicate.msg = f"{intercepted.name}{INTERCEPTED_LOG_SEPARATOR}{record.msg}"
+        duplicate.msg = f"{record.msg} :{intercepted.name}:"
         interceptor.handle(duplicate)
 
     return handle_p

logger_36/version.py

@@ -29,4 +29,4 @@
 # The fact that you are presently reading this means that you have had
 # knowledge of the CeCILL license and that you accept its terms.
 
-__version__ = "2024.11"
+__version__ = "2024.13"

{logger_36-2024.11.dist-info → logger_36-2024.13.dist-info}/METADATA

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

@@ -1,19 +1,19 @@
 logger_36/__init__.py,sha256=67ZAWtUx9Qy8Yn-tLQkOIEO6Z9U-8jhfm-tqNjjeFPU,1758
 logger_36/instance.py,sha256=wAVty29f24SCs4FRL600QySlA_WeLUM78p4t_Ni-LzA,1618
-logger_36/main.py,sha256=peXqcSDTrJhlKQkxSmum94BUJ8pIrtWTfvV9hUXp_pU,6558
-logger_36/version.py,sha256=VPjT_M7RlFPu1ODt109-IVr0VpM4GYTOMO2BBrkKt0A,1578
+logger_36/main.py,sha256=H0MW3hZXdXHjTnliH8GNJkjqPZITLTaeaNH7lZPPFFI,6822
+logger_36/version.py,sha256=mdgjriUY276JSM3W1EzdgeLIIYLoA17Di2FfkJcKm7Y,1578
 logger_36/catalog/config/console_rich.py,sha256=XKRKJx_5dxp4mgan1D-u_qrQos-pezRccqKsnmn-ook,2119
-logger_36/catalog/handler/console.py,sha256=dm2-_1ZXUd6Gl1uyJaapPhUldzkEZ2fOlgeH8gxmpSs,3094
-logger_36/catalog/handler/console_rich.py,sha256=TMP9fupSY8OdGb3jeMAeSLjOssJBgcdwkTDo4Enud5U,6513
-logger_36/catalog/handler/file.py,sha256=tBShoy37F3riXDQc802feKzdpHQj5F3vqKaq211I1WI,3509
-logger_36/catalog/handler/generic.py,sha256=H0ky_4Ua0_xAXrjtAjVFvSteagdSu1WEXrPKcG4qbRY,6050
+logger_36/catalog/handler/console.py,sha256=_CJcd9WiEQcfDZgcCPSSU_9ZlOqx8jztSuMNKy7bt04,3205
+logger_36/catalog/handler/console_rich.py,sha256=6tCWYe3fuDf10x1Qoobyal-DV9BQjbUWpJ6JvtFZ0Ac,6624
+logger_36/catalog/handler/file.py,sha256=kwRqDgGC8SP9Ojg652a71QzSGjIkerKv_cS7IITqJGE,3620
+logger_36/catalog/handler/generic.py,sha256=xpFnMuG3d9Xr2i5Tu_y8pU2Ohuu6CeZ4oGg5xyHmTtQ,6435
 logger_36/catalog/logging/chronos.py,sha256=zVe5ZwB63mqNqlIDm6ZBi4-U5n_n-21h8umhimRUcdU,1815
 logger_36/catalog/logging/gpu.py,sha256=0XqVVK_TV1QPEwGXyK99jThHAjfsf-V__3m9Jh4gewk,2783
 logger_36/catalog/logging/memory.py,sha256=-5SOXAV43RnXznBPbClVMpMqtMlVtBsI46w6ngz1oP4,4040
 logger_36/catalog/logging/system.py,sha256=zomL8kRpmQuVP5KkcJkcUTnXK4ah3yn9PJb_cveNZDQ,2449
 logger_36/config/issue.py,sha256=wAOChQMpGECw-4Jy0TWArOeQ1P134cGyKaVbc6NrwX8,1639
 logger_36/config/memory.py,sha256=2OvnG7RMM1aZcUWBYGcNoBdLsQguo8cV862vCYSMbQs,1589
-logger_36/config/message.py,sha256=ZrR0jE144e88Dy_H5CXfmIAZnNsXH5P6i2VjCKaPU5w,2058
+logger_36/config/message.py,sha256=fTZDkA6N9BBwfcTwRdEliAja0qPZwAdrxMORNFi1WLk,2021
 logger_36/config/system.py,sha256=i39b-QNbg7i3BW_X-bHH9CqGO6mq1k9Ru5faYPi63SA,1849
 logger_36/constant/error.py,sha256=mqlzrSdOJkuMxtRQnhNXosiGEYp8KInODBJIIdCNgbE,2197
 logger_36/constant/generic.py,sha256=s0WHW-R_Eu2doDMoGERX3MtfCHmIW6uDjrDt_qP5MLA,1616
@@ -31,10 +31,10 @@ logger_36/task/format/message.py,sha256=91CCgH7umLHUV_YRf4AyOsYZTgNVOvQSODqXO1wJ
 logger_36/task/format/rule.py,sha256=cq4jl_ZCb8m7QoX8mWevXhy1hgwncLpc-9woKoT7m24,1970
 logger_36/task/measure/chronos.py,sha256=7xZskYEXQCPDypmnlhn4KDCBB1v3eL1OE_sv-l3n8Do,2255
 logger_36/task/measure/memory.py,sha256=aichGI-iCeE3Z4Y8AmWGdal2931IMdcdv4VgCeDLBoI,1876
-logger_36/type/extension.py,sha256=W4sS48WiUUQStWq7rt8gZxtilElpfNSVc6cG3j8kfDA,5992
+logger_36/type/extension.py,sha256=U28VqEL3Wq_E_TZ-ZlBAXRyTr9oVPnA6ez7EyHjKM0E,7673
 logger_36/type/issue.py,sha256=OnkBKRTMsHvZ-2aLQWtBzGSWMTVs_4ermg71Ygcs0w8,2153
-logger_36/type/logger.py,sha256=FAaYj3wH9R9mhLNZLkYxjWwviWjDLBp4EilbHZnORJM,13248
-logger_36-2024.11.dist-info/METADATA,sha256=JBX4N-jAY_UNB4PpM9VrABAqQx1RA-ZfFyFfFos_T5k,5592
-logger_36-2024.11.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-logger_36-2024.11.dist-info/top_level.txt,sha256=sM95BTMWmslEEgR_1pzwZsOeSp8C_QBiu8ImbFr0XLc,10
-logger_36-2024.11.dist-info/RECORD,,
+logger_36/type/logger.py,sha256=mBk1Bd7Iunu4utnz8UqBCQRhDW9spLZhBZ2hAH8mTZE,13199
+logger_36-2024.13.dist-info/METADATA,sha256=DD-SjP5m4_DkDUd3V_Ma1W1gJgrCWDjcYYzmx7JjedU,5592
+logger_36-2024.13.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+logger_36-2024.13.dist-info/top_level.txt,sha256=sM95BTMWmslEEgR_1pzwZsOeSp8C_QBiu8ImbFr0XLc,10
+logger_36-2024.13.dist-info/RECORD,,