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

logger_36/catalog/config/console_rich.py

@@ -25,7 +25,6 @@ LEVEL_COLOR: dict[int, str | style_t] = {
 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))

logger_36/catalog/handler/console.py

@@ -18,12 +18,11 @@ from logger_36.type.handler import handler_extension_t
 @d.dataclass(slots=True, repr=False, eq=False)
 class console_handler_t(lggg.Handler):
     extension: handler_extension_t = d.field(init=False)
-    FormattedLines: h.Callable[..., tuple[str, str | None]] = d.field(init=False)
+    MessageFromRecord: h.Callable[..., tuple[str, str | None]] = d.field(init=False)
 
     name: d.InitVar[str | None] = None
     level: d.InitVar[int] = lggg.NOTSET
-    show_where: d.InitVar[bool] = True
-    show_memory_usage: d.InitVar[bool] = False
+    should_store_memory_usage: d.InitVar[bool] = False
     message_width: d.InitVar[int] = -1
     formatter: d.InitVar[lggg.Formatter | None] = None
 
@@ -31,8 +30,7 @@ class console_handler_t(lggg.Handler):
         self,
         name: str | None,
         level: int,
-        show_where: bool,
-        show_memory_usage: bool,
+        should_store_memory_usage: bool,
         message_width: int,
         formatter: lggg.Formatter | None,
     ) -> None:
@@ -41,22 +39,21 @@ class console_handler_t(lggg.Handler):
 
         self.extension = handler_extension_t(
             name=name,
-            show_where=show_where,
-            show_memory_usage=show_memory_usage,
+            should_store_memory_usage=should_store_memory_usage,
             handler=self,
             level=level,
             message_width=message_width,
             formatter=formatter,
         )
 
-        self.FormattedLines = self.extension.FormattedLines
+        self.MessageFromRecord = self.extension.MessageFromRecord
 
     def emit(self, record: lggg.LogRecord, /) -> None:
         """"""
         if hasattr(record, SHOW_W_RULE_ATTR):
             message = RuleAsText(record.msg)
         else:
-            message, _ = self.FormattedLines(record, should_join_lines=True)
+            message = self.MessageFromRecord(record)
         print(message)
 
     def ShowMessage(self, message: str, /, *, indented: bool = False) -> None:

logger_36/catalog/handler/console_rich.py

@@ -14,20 +14,13 @@ from logger_36.catalog.config.console_rich import (
     ALTERNATIVE_BACKGROUND_FOR_DARK,
     ALTERNATIVE_BACKGROUND_FOR_LIGHT,
     DATE_TIME_COLOR,
-    ELAPSED_TIME_COLOR,
     EXPECTED_COLOR,
     GRAY_COLOR,
     LEVEL_COLOR,
     WHITE_COLOR,
 )
-from logger_36.config.message import (
-    ACTUAL_PATTERNS,
-    ELAPSED_TIME_SEPARATOR,
-    EXPECTED_PATTERNS,
-    LEVEL_CLOSING,
-    WHERE_SEPARATOR,
-)
-from logger_36.constant.message import LINE_INDENT
+from logger_36.config.message import ACTUAL_PATTERNS, EXPECTED_PATTERNS, WHERE_SEPARATOR
+from logger_36.constant.message import CONTEXT_LENGTH, 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
@@ -64,14 +57,13 @@ class console_rich_handler_t(lggg.Handler):
 
     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)
+    MessageFromRecord: h.Callable[..., str] = 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
-    show_where: d.InitVar[bool] = True
-    show_memory_usage: d.InitVar[bool] = False
+    should_store_memory_usage: d.InitVar[bool] = False
     message_width: d.InitVar[int] = -1
     formatter: d.InitVar[lggg.Formatter | None] = None
     should_install_traceback: d.InitVar[bool] = False
@@ -83,8 +75,7 @@ class console_rich_handler_t(lggg.Handler):
         self,
         name: str | None,
         level: int,
-        show_where: bool,
-        show_memory_usage: bool,
+        should_store_memory_usage: bool,
         message_width: int,
         formatter: lggg.Formatter | None,
         should_install_traceback: bool,
@@ -96,8 +87,7 @@ class console_rich_handler_t(lggg.Handler):
 
         self.extension = handler_extension_t(
             name=name,
-            show_where=show_where,
-            show_memory_usage=show_memory_usage,
+            should_store_memory_usage=should_store_memory_usage,
             handler=self,
             level=level,
             message_width=message_width,
@@ -127,7 +117,7 @@ class console_rich_handler_t(lggg.Handler):
             rich_traceback_kwargs["console"] = self.console
             InstallTracebackHandler(**rich_traceback_kwargs)
 
-        self.FormattedLines = self.extension.FormattedLines
+        self.MessageFromRecord = self.extension.MessageFromRecord
         if self.alternating_lines == 1:
             self.alternating_lines = 0
             self.background_is_light = False
@@ -142,14 +132,13 @@ 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, PreProcessed=EscapedVersion)
+            message = self.MessageFromRecord(record, PreProcessed=EscapedVersion)
             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,
+                message,
                 record.levelno,
                 should_highlight_back=should_highlight_back,
                 background_is_light=self.background_is_light,
@@ -172,8 +161,7 @@ class console_rich_handler_t(lggg.Handler):
 
 def HighlightedVersion(
     _: console_t,
-    first_line: str,
-    next_lines: str | None,
+    message: str,
     log_level: int,
     /,
     *,
@@ -181,24 +169,13 @@ def HighlightedVersion(
     background_is_light: bool = True,
 ) -> renderable_t:
     """"""
-    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.
-    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(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:
-        output.append(next_lines)
+    output = text_t(message, WHITE_COLOR)
 
-    _ = output.highlight_regex(ACTUAL_PATTERNS, style=ACTUAL_COLOR)
+    output.stylize(LEVEL_COLOR[log_level], end=CONTEXT_LENGTH)
+    where = message.rfind(WHERE_SEPARATOR)
+    if (where >= 0) and ("\n" not in message[where:]):
+        output.stylize(GRAY_COLOR, start=where)
+    _ = output.highlight_words(ACTUAL_PATTERNS, style=ACTUAL_COLOR)
     _ = output.highlight_regex(EXPECTED_PATTERNS, style=EXPECTED_COLOR)
 
     if should_highlight_back:

logger_36/catalog/handler/file.py

@@ -20,12 +20,11 @@ from logger_36.type.handler import handler_extension_t
 class file_handler_t(lggg.FileHandler):
 
     extension: handler_extension_t = d.field(init=False)
-    FormattedLines: h.Callable[..., tuple[str, str | None]] = d.field(init=False)
+    MessageFromRecord: h.Callable[..., tuple[str, str | None]] = d.field(init=False)
 
     name: d.InitVar[str | None] = None
     level: d.InitVar[int] = lggg.NOTSET
-    show_where: d.InitVar[bool] = True
-    show_memory_usage: d.InitVar[bool] = False
+    should_store_memory_usage: d.InitVar[bool] = False
     message_width: d.InitVar[int] = -1
     formatter: d.InitVar[lggg.Formatter | None] = None
 
@@ -37,8 +36,7 @@ class file_handler_t(lggg.FileHandler):
         self,
         name: str | None,
         level: int,
-        show_where: bool,
-        show_memory_usage: bool,
+        should_store_memory_usage: bool,
         message_width: int,
         formatter: lggg.Formatter | None,
         path: path_t | None,
@@ -50,22 +48,21 @@ class file_handler_t(lggg.FileHandler):
 
         self.extension = handler_extension_t(
             name=name,
-            show_where=show_where,
-            show_memory_usage=show_memory_usage,
+            should_store_memory_usage=should_store_memory_usage,
             handler=self,
             level=level,
             message_width=message_width,
             formatter=formatter,
         )
 
-        self.FormattedLines = self.extension.FormattedLines
+        self.MessageFromRecord = self.extension.MessageFromRecord
 
     def emit(self, record: lggg.LogRecord, /) -> None:
         """"""
         if hasattr(record, SHOW_W_RULE_ATTR):
             message = RuleAsText(record.msg)
         else:
-            message, _ = self.FormattedLines(record, should_join_lines=True)
+            message = self.MessageFromRecord(record)
         print(message, file=self.stream)
         self.stream.flush()
 

logger_36/catalog/handler/generic.py

@@ -60,12 +60,11 @@ class generic_handler_t(lggg.Handler):
 
     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)
+    MessageFromRecord: h.Callable[..., tuple[str, str | None]] = d.field(init=False)
 
     name: d.InitVar[str | None] = None
     level: d.InitVar[int] = lggg.NOTSET
-    show_where: d.InitVar[bool] = True
-    show_memory_usage: d.InitVar[bool] = False
+    should_store_memory_usage: d.InitVar[bool] = False
     message_width: d.InitVar[int] = -1
     formatter: d.InitVar[lggg.Formatter | None] = None
 
@@ -77,8 +76,7 @@ class generic_handler_t(lggg.Handler):
         self,
         name: str | None,
         level: int,
-        show_where: bool,
-        show_memory_usage: bool,
+        should_store_memory_usage: bool,
         message_width: int,
         formatter: lggg.Formatter | None,
         supports_html: bool,
@@ -90,8 +88,7 @@ class generic_handler_t(lggg.Handler):
 
         self.extension = handler_extension_t(
             name=name,
-            show_where=show_where,
-            show_memory_usage=show_memory_usage,
+            should_store_memory_usage=should_store_memory_usage,
             handler=self,
             level=level,
             message_width=message_width,
@@ -114,7 +111,7 @@ class generic_handler_t(lggg.Handler):
         else:
             self.DisplayRule = self._DisplayRuleAsText
 
-        self.FormattedLines = self.extension.FormattedLines
+        self.MessageFromRecord = self.extension.MessageFromRecord
         if self.alternating_lines == 1:
             self.alternating_lines = 0
             self.background_is_light = False
@@ -130,19 +127,18 @@ class generic_handler_t(lggg.Handler):
             if hasattr(record, SHOW_W_RULE_ATTR):
                 message = RuleAsText(record.msg)
             else:
-                message, _ = self.FormattedLines(record, should_join_lines=True)
+                message = self.MessageFromRecord(record)
         else:
             if hasattr(record, SHOW_W_RULE_ATTR):
                 richer = Rule(record.msg, DATE_TIME_COLOR)
             else:
-                first, next_s = self.FormattedLines(record, PreProcessed=EscapedForRich)
+                message = self.MessageFromRecord(record, PreProcessed=EscapedForRich)
                 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,
+                    message,
                     record.levelno,
                     should_highlight_back=should_highlight_back,
                     background_is_light=self.background_is_light,

logger_36/catalog/logger/chronos.py

@@ -4,7 +4,6 @@ Contributor(s): Eric Debreuve (eric.debreuve@cnrs.fr) since 2023
 SEE COPYRIGHT NOTICE BELOW
 """
 
-from logger_36.constant.logger import HIDE_WHERE_KWARG
 from logger_36.instance.logger import LOGGER
 from logger_36.task.measure.chronos import ElapsedTime
 from logger_36.type.logger import logger_t
@@ -12,7 +11,7 @@ from logger_36.type.logger import logger_t
 
 def LogElapsedTime(*, logger: logger_t = LOGGER) -> None:
     """"""
-    logger.info(f"Elapsed Time: {ElapsedTime()}", **HIDE_WHERE_KWARG)
+    logger.info(f"Elapsed Time: {ElapsedTime()}")
 
 
 """

logger_36/catalog/logger/gpu.py

@@ -7,7 +7,6 @@ SEE COPYRIGHT NOTICE BELOW
 import sys as sstm
 
 from logger_36.constant.error import GPU_LOGGING_ERROR
-from logger_36.constant.logger import HIDE_WHERE_KWARG
 from logger_36.instance.logger import LOGGER
 from logger_36.type.logger import logger_t
 
@@ -41,7 +40,6 @@ def LogGPURelatedDetails(*, logger: logger_t = LOGGER) -> None:
         f"          Tensorflow: {tsfl.version.VERSION}\n"
         f"    Tensorflow Build: {tsfl.sysconfig.get_build_info()}\n"
         f"            TensorRT: {tsrt.__version__}",
-        **HIDE_WHERE_KWARG,
     )
 
 

logger_36/catalog/logger/memory.py

@@ -5,11 +5,10 @@ SEE COPYRIGHT NOTICE BELOW
 """
 
 from logger_36.config.memory import LENGTH_100, MAX_N_SAMPLES
-from logger_36.constant.logger import HIDE_WHERE_KWARG
 from logger_36.constant.memory import storage_units_h
 from logger_36.instance.logger import LOGGER
 from logger_36.task.format.memory import FormattedUsage, UsageBar
-from logger_36.task.format.message import FormattedMessage
+from logger_36.task.format.message import MessageWithActualExpected
 from logger_36.type.logger import logger_t
 
 
@@ -22,7 +21,7 @@ def LogMemoryUsages(
     logger: logger_t = LOGGER,
 ) -> None:
     """"""
-    if not logger.any_handler_shows_memory:
+    if not logger.any_handler_stores_memory:
         return
 
     where_s, usages = zip(*logger.memory_usages)
@@ -34,7 +33,7 @@ def LogMemoryUsages(
     if isinstance(max_n_samples, int):
         if max_n_samples < 1:
             raise ValueError(
-                FormattedMessage(
+                MessageWithActualExpected(
                     "Invalid maximum number of samples",
                     actual=max_n_samples,
                     expected=1,
@@ -65,7 +64,7 @@ def LogMemoryUsages(
         )
     plot = "\n".join(plot)
 
-    logger.info(title + plot, **HIDE_WHERE_KWARG)
+    logger.info(title + plot)
 
 
 def LogMaximumMemoryUsage(
@@ -77,12 +76,10 @@ def LogMaximumMemoryUsage(
     """
     unit: b or None=bytes, k=kilo, m=mega, g=giga, a=auto
     """
-    if logger.any_handler_shows_memory:
+    if logger.any_handler_stores_memory:
         where, max_usage = logger.max_memory_usage_full
         value, unit = FormattedUsage(max_usage, unit=unit, decimals=decimals)
-        logger.info(
-            f"Max. Memory Usage: {value}{unit} near {where}", **HIDE_WHERE_KWARG
-        )
+        logger.info(f"Max. Memory Usage: {value}{unit} near {where}")
 
 
 """

logger_36/catalog/logger/system.py

@@ -4,7 +4,6 @@ Contributor(s): Eric Debreuve (eric.debreuve@cnrs.fr) since 2023
 SEE COPYRIGHT NOTICE BELOW
 """
 
-from logger_36.constant.logger import HIDE_WHERE_KWARG
 from logger_36.constant.system import MAX_DETAIL_NAME_LENGTH, SYSTEM_DETAILS_AS_DICT
 from logger_36.instance.logger import LOGGER
 from logger_36.task.inspection import Modules
@@ -35,7 +34,6 @@ def LogSystemDetails(
         f"{details}\n"
         f"    {'Python Modules':>{MAX_DETAIL_NAME_LENGTH}}:\n"
         f"{modules}",
-        **HIDE_WHERE_KWARG,
     )
 
 

logger_36/config/logger.py

@@ -12,7 +12,7 @@ from logger_36.catalog.handler.file import file_handler_t
 from logger_36.catalog.handler.generic import generic_handler_t
 from logger_36.constant.handler import HANDLER_CODES, handler_codes_h
 from logger_36.instance.logger import LOGGER
-from logger_36.task.format.message import FormattedMessage
+from logger_36.task.format.message import MessageWithActualExpected
 
 
 def SetLOGLevel(
@@ -48,7 +48,7 @@ def SetLOGLevel(
 
     if not found:
         raise ValueError(
-            FormattedMessage(
+            MessageWithActualExpected(
                 "Handler not found",
                 actual=which,
                 expected=f"{str(HANDLER_CODES)[1:-1]}, or a handler name",

logger_36/config/message.py

@@ -4,20 +4,19 @@ Contributor(s): Eric Debreuve (eric.debreuve@cnrs.fr) since 2023
 SEE COPYRIGHT NOTICE BELOW
 """
 
+from datetime import timedelta as time_delta_t
+
 LEVEL_OPENING = "("
 LEVEL_CLOSING = ")"
-MESSAGE_MARKER = "| "
+MESSAGE_MARKER = "|"
 WHERE_SEPARATOR = "@"
 ELAPSED_TIME_SEPARATOR = "+"
-MEMORY_SEPARATOR = ":"
 
 DATE_FORMAT = "%Y-%m-%d"
 TIME_FORMAT = "%H:%M:%S"
-WHERE_FORMAT = f" {WHERE_SEPARATOR} {{module}}:{{funcName}}:{{lineno}}"
-ELAPSED_TIME_FORMAT = f" {ELAPSED_TIME_SEPARATOR}%(elapsed_time)s"
-MEMORY_FORMAT = f" {MEMORY_SEPARATOR}%(memory_usage)s"
+LONG_ENOUGH = time_delta_t(minutes=5)
 
-ACTUAL_PATTERNS: str = r" Actual="
+ACTUAL_PATTERNS: tuple[str] = (r" Actual=",)
 EXPECTED_PATTERNS: str = r" Expected([!<>]?=|: )"
 
 """

logger_36/constant/logger.py

@@ -8,8 +8,6 @@ import logging as lggg
 import re as regx
 import typing as h
 
-from logger_36.constant.record import HIDE_WHERE_ATTR
-
 LOGGER_NAME = "logger-36"
 
 # https://docs.python.org/3/library/logging.html#logging.captureWarnings
@@ -17,8 +15,6 @@ WARNING_LOGGER_NAME = "py.warnings"
 WARNING_TYPE_PATTERN = r"([^:]+):([0-9]+): ([^:]+): ([^\n]+)\n"
 WARNING_TYPE_COMPILED_PATTERN = regx.compile(WARNING_TYPE_PATTERN)
 
-HIDE_WHERE_KWARG = {"extra": {HIDE_WHERE_ATTR: True}}
-
 # Second version: with self as first parameter.
 logger_handle_h = (
     h.Callable[[lggg.LogRecord], None] | h.Callable[[lggg.Logger, lggg.LogRecord], None]

logger_36/constant/message.py

@@ -8,6 +8,7 @@ import time
 import typing as h
 
 from logger_36.config.message import (
+    ELAPSED_TIME_SEPARATOR,
     LEVEL_CLOSING,
     LEVEL_OPENING,
     MESSAGE_MARKER,
@@ -15,9 +16,10 @@ from logger_36.config.message import (
 )
 
 TIME_LENGTH = time.strftime(TIME_FORMAT, time.gmtime(0)).__len__()
+TIME_LENGTH_m_1 = TIME_LENGTH - ELAPSED_TIME_SEPARATOR.__len__()
 LOG_LEVEL_LENGTH = 1 + LEVEL_OPENING.__len__() + LEVEL_CLOSING.__len__()
 CONTEXT_LENGTH = TIME_LENGTH + LOG_LEVEL_LENGTH
-LINE_INDENT = (CONTEXT_LENGTH + MESSAGE_MARKER.__len__() + 1) * " "
+LINE_INDENT = (CONTEXT_LENGTH + MESSAGE_MARKER.__len__() + 2) * " "
 NEXT_LINE_PROLOGUE = "\n" + LINE_INDENT
 
 expected_op_h = h.Literal[":", ": ", "=", "!=", ">=", "<="]

logger_36/constant/record.py

@@ -4,10 +4,9 @@ Contributor(s): Eric Debreuve (eric.debreuve@cnrs.fr) since 2023
 SEE COPYRIGHT NOTICE BELOW
 """
 
-SHOW_W_RULE_ATTR = "show_w_rule"
-SHOW_WHERE_ATTR = "where"
-HIDE_WHERE_ATTR = "hide_where"
-SHOW_MEMORY_ATTR = "show_memory_usage"
+SHOW_W_RULE_ATTR = "should_show_w_rule"
+STORE_MEMORY_ATTR = "should_store_memory_usage"
+HIDE_WHERE_ATTR = "should_hide_where"
 
 """
 COPYRIGHT NOTICE

logger_36/content.py

@@ -5,7 +5,7 @@ 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.message import MessageWithActualExpected
 from logger_36.task.format.rule import Rule, RuleAsText
 
 """

logger_36/handler.py

@@ -33,8 +33,7 @@ def AddGenericHandler(
     logger: lggg.Logger | None = None,
     name: str | None = None,
     level: int = lggg.INFO,
-    show_where: bool = True,
-    show_memory_usage: bool = False,
+    should_store_memory_usage: bool = False,
     message_width: int = -1,
     formatter: lggg.Formatter | None = None,
     supports_html: bool = False,
@@ -50,8 +49,7 @@ def AddGenericHandler(
     handler = generic_handler_t(
         name=name,
         level=level,
-        show_where=show_where,
-        show_memory_usage=show_memory_usage,
+        should_store_memory_usage=should_store_memory_usage,
         message_width=message_width,
         formatter=formatter,
         supports_html=supports_html,
@@ -68,8 +66,7 @@ def AddConsoleHandler(
     logger: lggg.Logger | None = None,
     name: str | None = None,
     level: int = lggg.INFO,
-    show_where: bool = True,
-    show_memory_usage: bool = False,
+    should_store_memory_usage: bool = False,
     message_width: int = -1,
     formatter: lggg.Formatter | None = None,
     should_hold_messages: bool = False,
@@ -81,8 +78,7 @@ def AddConsoleHandler(
     handler = console_handler_t(
         name=name,
         level=level,
-        show_where=show_where,
-        show_memory_usage=show_memory_usage,
+        should_store_memory_usage=should_store_memory_usage,
         message_width=message_width,
         formatter=formatter,
     )
@@ -94,8 +90,7 @@ def AddRichConsoleHandler(
     logger: lggg.Logger | None = None,
     name: str | None = None,
     level: int = lggg.INFO,
-    show_where: bool = True,
-    show_memory_usage: bool = False,
+    should_store_memory_usage: bool = False,
     message_width: int = -1,
     formatter: lggg.Formatter | None = None,
     alternating_lines: int = 2,
@@ -125,8 +120,7 @@ def AddRichConsoleHandler(
     handler = console_rich_handler_t(
         name=name,
         level=level,
-        show_where=show_where,
-        show_memory_usage=show_memory_usage,
+        should_store_memory_usage=should_store_memory_usage,
         message_width=message_width,
         formatter=formatter,
         **additional_s,
@@ -141,8 +135,7 @@ def AddFileHandler(
     logger: lggg.Logger | None = None,
     name: str | None = None,
     level: int = lggg.INFO,
-    show_where: bool = True,
-    show_memory_usage: bool = False,
+    should_store_memory_usage: bool = False,
     message_width: int = -1,
     formatter: lggg.Formatter | None = None,
     should_hold_messages: bool = False,
@@ -159,8 +152,7 @@ def AddFileHandler(
     handler = file_handler_t(
         name=name,
         level=level,
-        show_where=show_where,
-        show_memory_usage=show_memory_usage,
+        should_store_memory_usage=should_store_memory_usage,
         message_width=message_width,
         formatter=formatter,
         path=path,

logger_36/task/format/memory.py

@@ -5,7 +5,7 @@ SEE COPYRIGHT NOTICE BELOW
 """
 
 from logger_36.constant.memory import STORAGE_UNITS, storage_units_h
-from logger_36.task.format.message import FormattedMessage
+from logger_36.task.format.message import MessageWithActualExpected
 
 _KILO_UNIT = 1000.0
 _MEGA_UNIT = _KILO_UNIT * 1000.0
@@ -41,7 +41,7 @@ def FormattedUsage(
         value, unit = FormattedUsageWithAutoUnit(usage, decimals)
     else:
         raise ValueError(
-            FormattedMessage(
+            MessageWithActualExpected(
                 "Invalid unit", actual=unit, expected=str(STORAGE_UNITS)[1:-1]
             )
         )

logger_36/task/format/message.py

@@ -7,35 +7,11 @@ SEE COPYRIGHT NOTICE BELOW
 import difflib as diff
 import typing as h
 
-from logger_36.config.message import (
-    ELAPSED_TIME_FORMAT,
-    LEVEL_CLOSING,
-    LEVEL_OPENING,
-    MEMORY_FORMAT,
-    MESSAGE_MARKER,
-)
 from logger_36.constant.generic import NOT_PASSED
 from logger_36.constant.message import expected_op_h
 
 
-def MessageFormat(with_where: bool, with_memory_usage: bool, /) -> str:
-    """"""
-    output = [
-        f"%(asctime)s"
-        f"{LEVEL_OPENING}%(level_first_letter)s{LEVEL_CLOSING}\t"
-        f"{MESSAGE_MARKER}%(message)s"
-    ]
-
-    if with_where:
-        output.append("%(where)s")
-    output.append(ELAPSED_TIME_FORMAT)
-    if with_memory_usage:
-        output.append(MEMORY_FORMAT)
-
-    return "".join(output)
-
-
-def FormattedMessage(
+def MessageWithActualExpected(
     message: str,
     /,
     *,