logger-36 2025.5__py3-none-any.whl → 2025.7__py3-none-any.whl

logger_36/handler.py

@@ -8,26 +8,23 @@ import logging as l
 import sys as s
 from pathlib import Path as path_t
 
+from logger_36.catalog.config.optional import MISSING_RICH_MESSAGE, RICH_IS_AVAILABLE
 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, show_message_p
-from logger_36.constant.error import MISSING_RICH_ERROR
+from logger_36.catalog.handler.generic import LogAsIs_h, generic_handler_t
 
-try:
+if RICH_IS_AVAILABLE:
     from logger_36.catalog.handler.console_rich import console_rich_handler_t
-
-    _MISSING_RICH_ERROR = None
-except ModuleNotFoundError:
+else:
     from logger_36.catalog.handler.console import (
         console_handler_t as console_rich_handler_t,
     )
-
-    _MISSING_RICH_ERROR = MISSING_RICH_ERROR
+_MISSING_RICH_MESSAGE = MISSING_RICH_MESSAGE
 
 
 def AddGenericHandler(
     logger: l.Logger,
-    ShowMessage: show_message_p,
+    LogAsIs: LogAsIs_h,
     /,
     *,
     name: str | None = None,
@@ -52,9 +49,9 @@ def AddGenericHandler(
         alternating_lines=alternating_lines,
         should_record=should_record,
         rich_kwargs=kwargs,
-        ShowMessage=ShowMessage,
+        LogAsIs=LogAsIs,
     )
-    logger.AddHandler(handler, should_hold_messages)
+    logger.AddHandler(handler, should_hold_messages=should_hold_messages)
 
 
 def AddConsoleHandler(
@@ -76,7 +73,7 @@ def AddConsoleHandler(
         message_width=message_width,
         formatter=formatter,
     )
-    logger.AddHandler(handler, should_hold_messages)
+    logger.AddHandler(handler, should_hold_messages=should_hold_messages)
 
 
 def AddRichConsoleHandler(
@@ -95,10 +92,10 @@ def AddRichConsoleHandler(
     **kwargs,
 ) -> None:
     """"""
-    global _MISSING_RICH_ERROR
-    if _MISSING_RICH_ERROR is not None:
-        print(_MISSING_RICH_ERROR, file=s.stderr)
-        _MISSING_RICH_ERROR = None
+    global _MISSING_RICH_MESSAGE
+    if _MISSING_RICH_MESSAGE is not None:
+        print(_MISSING_RICH_MESSAGE, file=s.stderr)
+        _MISSING_RICH_MESSAGE = None
 
     if console_rich_handler_t is console_handler_t:
         additional_s = {}
@@ -117,7 +114,7 @@ def AddRichConsoleHandler(
         formatter=formatter,
         **additional_s,
     )
-    logger.AddHandler(handler, should_hold_messages)
+    logger.AddHandler(handler, should_hold_messages=should_hold_messages)
 
 
 def AddFileHandler(
@@ -149,7 +146,7 @@ def AddFileHandler(
         handler_args=args,
         handler_kwargs=kwargs,
     )
-    logger.AddHandler(handler, should_hold_messages)
+    logger.AddHandler(handler, should_hold_messages=should_hold_messages)
 
 
 """

logger_36/memory.py

@@ -4,14 +4,17 @@ Contributor(s): Eric Debreuve (eric.debreuve@cnrs.fr) since 2023
 SEE COPYRIGHT NOTICE BELOW
 """
 
-from logger_36.catalog.logger.memory import LogMaximumMemoryUsage, LogMemoryUsages
-from logger_36.task.format.memory import FormattedUsage as FormattedMemoryUsage
-from logger_36.task.format.memory import (
+from logger_36.catalog.logger.memory import (  # noqa
+    LogMaximumMemoryUsage,
+    LogMemoryUsages,
+)
+from logger_36.task.format.memory import FormattedUsage as FormattedMemoryUsage  # noqa
+from logger_36.task.format.memory import (  # noqa
     FormattedUsageWithAutoUnit as FormattedMemoryUsageWithAutoUnit,
 )
-from logger_36.task.format.memory import UsageBar as MemoryUsageBar
-from logger_36.task.measure.memory import CanCheckUsage as CanCheckMemoryUsage
-from logger_36.task.measure.memory import CurrentUsage as CurrentMemoryUsage
+from logger_36.task.format.memory import UsageBar as MemoryUsageBar  # noqa
+from logger_36.task.measure.memory import CanCheckUsage as CanCheckMemoryUsage  # noqa
+from logger_36.task.measure.memory import CurrentUsage as CurrentMemoryUsage  # noqa
 
 """
 COPYRIGHT NOTICE

logger_36/storage.py

@@ -4,7 +4,7 @@ Contributor(s): Eric Debreuve (eric.debreuve@cnrs.fr) since 2023
 SEE COPYRIGHT NOTICE BELOW
 """
 
-from logger_36.task.storage import SaveLOGasHTML
+from logger_36.task.storage import SaveLOGasHTML  # noqa
 
 """
 COPYRIGHT NOTICE

logger_36/system.py

@@ -4,7 +4,7 @@ Contributor(s): Eric Debreuve (eric.debreuve@cnrs.fr) since 2023
 SEE COPYRIGHT NOTICE BELOW
 """
 
-from logger_36.catalog.logger.system import LogSystemDetails
+from logger_36.catalog.logger.system import LogSystemDetails  # noqa
 
 """
 COPYRIGHT NOTICE

logger_36/task/format/rule.py

@@ -4,6 +4,8 @@ Contributor(s): Eric Debreuve (eric.debreuve@cnrs.fr) since 2023
 SEE COPYRIGHT NOTICE BELOW
 """
 
+from logger_36.catalog.config.optional import RICH_IS_AVAILABLE
+
 
 def RuleAsText(text: str | None, /) -> str:
     """"""
@@ -13,7 +15,7 @@ def RuleAsText(text: str | None, /) -> str:
         return f"---- ---- ---- ---- {text} ---- ---- ---- ----"
 
 
-try:
+if RICH_IS_AVAILABLE:
     from rich.rule import Rule as rule_t  # noqa
     from rich.text import Text as text_t  # noqa
 
@@ -24,7 +26,7 @@ try:
         else:
             return rule_t(title=text_t(text, style=f"bold {color}"), style=color)
 
-except ModuleNotFoundError:
+else:
     Rule = lambda _txt, _: RuleAsText(_txt)
 
 """

logger_36/task/measure/memory.py

@@ -6,10 +6,10 @@ SEE COPYRIGHT NOTICE BELOW
 
 try:
     from psutil import Process as process_t  # noqa
-
-    _PROCESS = process_t()
 except ModuleNotFoundError:
     _PROCESS = None
+else:
+    _PROCESS = process_t()
 
 
 def CanCheckUsage() -> bool:

logger_36/task/storage.py

@@ -6,17 +6,19 @@ SEE COPYRIGHT NOTICE BELOW
 
 import dataclasses as d
 import logging as l
-import re as regx
+import re as r
 from html.parser import HTMLParser as html_parser_t
 from io import IOBase as io_base_t
 from pathlib import Path as path_t
 
-try:
+from logger_36.catalog.config.optional import RICH_IS_AVAILABLE
+from logger_36.instance.logger import L
+
+if RICH_IS_AVAILABLE:
     from rich.console import Console as console_t  # noqa
-except ModuleNotFoundError:
+else:
     console_t = None
 
-from logger_36.instance.logger import L
 
 _BODY_END_PATTERN = r"</[bB][oO][dD][yY]>(.|\n)*$"
 
@@ -60,7 +62,7 @@ class html_reader_t(html_parser_t):
             output[self.body_position_start[0] : (self.body_position_end[0] + 1)]
         )
         output = output[self.body_position_start[1] :]
-        output = regx.sub(_BODY_END_PATTERN, "", output, count=1)
+        output = r.sub(_BODY_END_PATTERN, "", output, count=1)
 
         return output.strip()
 

logger_36/time.py

@@ -4,8 +4,8 @@ Contributor(s): Eric Debreuve (eric.debreuve@cnrs.fr) since 2023
 SEE COPYRIGHT NOTICE BELOW
 """
 
-from logger_36.catalog.logger.chronos import LogElapsedTime
-from logger_36.task.measure.chronos import ElapsedTime, TimeStamp
+from logger_36.catalog.logger.chronos import LogElapsedTime  # noqa
+from logger_36.task.measure.chronos import ElapsedTime, TimeStamp  # noqa
 
 """
 COPYRIGHT NOTICE

logger_36/type/handler.py

@@ -16,12 +16,28 @@ from logger_36.config.message import (
     WHERE_SEPARATOR,
 )
 from logger_36.constant.error import MEMORY_MEASURE_ERROR
-from logger_36.constant.handler import HANDLER_CODES
+from logger_36.constant.handler import HANDLER_KINDS
 from logger_36.constant.message import NEXT_LINE_PROLOGUE
 from logger_36.task.format.message import MessageWithActualExpected
 from logger_36.task.measure.chronos import TimeStamp
 from logger_36.task.measure.memory import CanCheckUsage as CanCheckMemoryUsage
 
+MessageFromRecordRaw_h = h.Callable[[l.LogRecord], str]
+
+
+@h.runtime_checkable
+class MessageFromRecordPreprocessed_p(h.Protocol):
+    def __call__(
+        self,
+        record: l.LogRecord,
+        /,
+        *,
+        PreProcessed: h.Callable[[str], str] | None = None,
+    ) -> str: ...
+
+
+MessageFromRecord_h = MessageFromRecordRaw_h | MessageFromRecordPreprocessed_p
+
 _MEMORY_MEASURE_ERROR = MEMORY_MEASURE_ERROR
 
 
@@ -30,7 +46,7 @@ class handler_extension_t:
     name: str | None = None
     should_store_memory_usage: bool = False
     message_width: int = -1
-    MessageFromRecord: h.Callable[..., str] = d.field(init=False)
+    MessageFromRecord: MessageFromRecord_h = d.field(init=False)
 
     handler: d.InitVar[l.Handler | None] = None
     level: d.InitVar[int] = l.NOTSET
@@ -42,12 +58,12 @@ class handler_extension_t:
         """"""
         global _MEMORY_MEASURE_ERROR
 
-        if self.name in HANDLER_CODES:
+        if self.name in HANDLER_KINDS:
             raise ValueError(
                 MessageWithActualExpected(
                     "Invalid handler name",
                     actual=self.name,
-                    expected=f"a name not in {str(HANDLER_CODES)[1:-1]}",
+                    expected=f"a name not in {str(HANDLER_KINDS)[1:-1]}",
                 )
             )