PyPI - logger-36 - Versions diffs - 2025.12__py3-none-any.whl → 2025.14__py3-none-any.whl - Mend

logger-36 2025.12py3-none-any.whl → 2025.14py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (24) hide show

logger_36/catalog/handler/console.py +22 -49
logger_36/catalog/handler/console_rich.py +73 -87
logger_36/catalog/handler/file.py +24 -55
logger_36/catalog/handler/generic.py +67 -68
logger_36/catalog/logger/gpu.py +1 -1
logger_36/catalog/logger/system.py +1 -1
logger_36/config/message.py +1 -0
logger_36/{api/handler.py → constant/html.py} +18 -6
logger_36/extension/exception.py +4 -2
logger_36/extension/line.py +83 -0
logger_36/task/format/memory.py +1 -5
logger_36/task/format/message.py +60 -1
logger_36/task/format/rule.py +3 -2
logger_36/task/inspection.py +1 -1
logger_36/task/storage.py +29 -8
logger_36/type/handler.py +101 -106
logger_36/type/logger.py +92 -60
logger_36/type/message.py +90 -0
logger_36/version.py +1 -1
{logger_36-2025.12.dist-info → logger_36-2025.14.dist-info}/METADATA +2 -2
{logger_36-2025.12.dist-info → logger_36-2025.14.dist-info}/RECORD +23 -22
{logger_36-2025.12.dist-info → logger_36-2025.14.dist-info}/WHEEL +1 -1
logger_36/task/handling.py +0 -196
{logger_36-2025.12.dist-info → logger_36-2025.14.dist-info}/top_level.txt +0 -0

logger_36/{api/handler.py → constant/html.py} RENAMED Viewed

@@ -4,12 +4,24 @@ Contributor(s): Eric Debreuve (eric.debreuve@cnrs.fr) since 2023
 SEE COPYRIGHT NOTICE BELOW
 """
-from logger_36.task.handling import (  # noqa
-    AddConsoleHandler,
-    AddFileHandler,
-    AddGenericHandler,
-    AddRichConsoleHandler,
-)
+TITLE_PLACEHOLDER = "TITLE"
+BODY_PLACEHOLDER = "BODY"
+MINIMAL_HTML = f"""
+    <!DOCTYPE html>
+    <html lang="en">
+        <head>
+            <meta charset="utf-8">
+            <title>{TITLE_PLACEHOLDER}</title>
+        </head>
+        <body>
+            <pre>
+{BODY_PLACEHOLDER}
+            </pre>
+        </body>
+    </html>
+"""
 """
 COPYRIGHT NOTICE

logger_36/extension/exception.py CHANGED Viewed

@@ -79,7 +79,9 @@ def _HandleException(
             variables = map(
                 lambda _: f"{_:{longest}} = {all_variables[_]}", sorted(found_names)
             )
-            variables = 2 * _INDENTATION + f"\n{2*_INDENTATION}".join(variables) + "\n"
+            variables = (
+                2 * _INDENTATION + f"\n{2 * _INDENTATION}".join(variables) + "\n"
+            )
         else:
             variables = ""
@@ -103,7 +105,7 @@ def _HandleException(
         f"{variables}"
         f"{message}"
         f"{_INDENTATION}{REPORT_COLOR}Full report at: file://{document.name}"
-        f"{MONOCHROME}{OPTIONAL_NEWLINE}",
+        f"{MONOCHROME}{OPTIONAL_NEWLINE}"
     )
     lines = tcbk.format_exception(exception)

logger_36/extension/line.py ADDED Viewed

@@ -0,0 +1,83 @@
+"""
+Copyright CNRS/Inria/UniCA
+Contributor(s): Eric Debreuve (eric.debreuve@cnrs.fr) since 2023
+SEE COPYRIGHT NOTICE BELOW
+"""
+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
+"""
+COPYRIGHT NOTICE
+This software is governed by the CeCILL  license under French law and
+abiding by the rules of distribution of free software.  You can  use,
+modify and/ or redistribute the software under the terms of the CeCILL
+license as circulated by CEA, CNRS and INRIA at the following URL
+"http://www.cecill.info".
+As a counterpart to the access to the source code and  rights to copy,
+modify and redistribute granted by the license, users are provided only
+with a limited warranty  and the software's author,  the holder of the
+economic rights,  and the successive licensors  have only  limited
+liability.
+In this respect, the user's attention is drawn to the risks associated
+with loading,  using,  modifying and/or developing or reproducing the
+software by the user in light of its specific status of free software,
+that may mean  that it is complicated to manipulate,  and  that  also
+therefore means  that it is reserved for developers  and  experienced
+professionals having in-depth computer knowledge. Users are therefore
+encouraged to load and test the software's suitability as regards their
+requirements in conditions enabling the security of their systems and/or
+data to be ensured and,  more generally, to use and operate it in the
+same conditions as regards security.
+The fact that you are presently reading this means that you have had
+knowledge of the CeCILL license and that you accept its terms.
+SEE LICENCE NOTICE: file README-LICENCE-utf8.txt at project source root.
+This software is being developed by Eric Debreuve, a CNRS employee and
+member of team Morpheme.
+Team Morpheme is a joint team between Inria, CNRS, and UniCA.
+It is hosted by the Centre Inria d'Université Côte d'Azur, Laboratory
+I3S, and Laboratory iBV.
+CNRS: https://www.cnrs.fr/index.php/en
+Inria: https://www.inria.fr/en/
+UniCA: https://univ-cotedazur.eu/
+Centre Inria d'Université Côte d'Azur: https://www.inria.fr/en/centre/sophia/
+I3S: https://www.i3s.unice.fr/en/
+iBV: http://ibv.unice.fr/
+Team Morpheme: https://team.inria.fr/morpheme/
+"""

logger_36/task/format/memory.py CHANGED Viewed

@@ -16,11 +16,7 @@ _BLOCK_FULL = "▉"
 def FormattedUsage(
-    usage: int,
-    /,
-    *,
-    unit: storage_units_h | None = "a",
-    decimals: int | None = None,
+    usage: int, /, *, unit: storage_units_h | None = "a", decimals: int | None = None
 ) -> tuple[int | float, str]:
     """
     unit: b or None=bytes, k=kilo, m=mega, g=giga, a=auto

logger_36/task/format/message.py CHANGED Viewed

@@ -5,10 +5,69 @@ SEE COPYRIGHT NOTICE BELOW
 """
 import difflib as diff
+import logging as l
 import typing as h
+from logger_36.config.message import (
+    LEVEL_CLOSING,
+    LEVEL_OPENING,
+    MESSAGE_MARKER,
+    WHERE_SEPARATOR,
+)
 from logger_36.constant.generic import NOT_PASSED
-from logger_36.constant.message import expected_op_h
+from logger_36.constant.message import NEXT_LINE_PROLOGUE, expected_op_h
+from logger_36.constant.record import SHOW_W_RULE_ATTR
+from logger_36.extension.line import WrappedLines
+from logger_36.type.message import RuleWithText_h
+def MessageFromRecord(
+    record: l.LogRecord,
+    RuleWithText: RuleWithText_h,
+    /,
+    *,
+    line_width: int = 0,
+    color: str | None = None,
+    PreProcessed: h.Callable[[str], str] | None = None,
+) -> tuple[str, bool]:
+    """
+    See logger_36.catalog.handler.README.txt.
+    The second returned value is is_not_a_rule.
+    """
+    message = record.msg
+    if hasattr(record, SHOW_W_RULE_ATTR):
+        return RuleWithText(message, color), False
+    if PreProcessed is not None:
+        message = PreProcessed(message)
+    if (line_width <= 0) or (message.__len__() <= line_width):
+        if "\n" in message:
+            message = NEXT_LINE_PROLOGUE.join(message.splitlines())
+    else:
+        if "\n" in message:
+            lines = WrappedLines(message.splitlines(), line_width)
+        else:
+            lines = WrappedLines([message], line_width)
+        message = NEXT_LINE_PROLOGUE.join(lines)
+    when_or_elapsed = getattr(record, "when_or_elapsed", None)
+    if when_or_elapsed is None:
+        return message, True
+    level_first_letter = getattr(record, "level_first_letter", "")
+    if (where := getattr(record, "where", None)) is None:
+        where = ""
+    else:
+        where = f"{NEXT_LINE_PROLOGUE}{WHERE_SEPARATOR} {where}"
+    return (
+        f"{when_or_elapsed}"
+        f"{LEVEL_OPENING}{level_first_letter}{LEVEL_CLOSING} "
+        f"{MESSAGE_MARKER} {message}{where}"
+    ), True
 def MessageWithActualExpected(

logger_36/task/format/rule.py CHANGED Viewed

@@ -7,7 +7,7 @@ SEE COPYRIGHT NOTICE BELOW
 from logger_36.catalog.config.optional import RICH_IS_AVAILABLE
-def RuleAsText(text: str | None, /) -> str:
+def RuleAsText(text: str | None, _: None, /) -> str:
     """"""
     if text is None:
         return "---- ---- ---- ---- ---- ---- ---- ---- ----"
@@ -27,7 +27,8 @@ if RICH_IS_AVAILABLE:
             return rule_t(title=text_t(text, style=f"bold {color}"), style=color)
 else:
-    Rule = lambda _txt, _: RuleAsText(_txt)
+    rule_t = text_t = None
+    Rule = lambda _, __: RuleAsText(_, None)
 """
 COPYRIGHT NOTICE

logger_36/task/inspection.py CHANGED Viewed

@@ -51,7 +51,7 @@ def Modules(
     if formatted:
         max_length += 4
-        AlignedInColumns = lambda _str: f"{_str:{max_length}}" if _str != "\n" else "\n"
+        AlignedInColumns = lambda _: f"{_:{max_length}}" if _ != "\n" else "\n"
         output = map(AlignedInColumns, output)
         output = "".join(output).rstrip()

logger_36/task/storage.py CHANGED Viewed

@@ -8,6 +8,7 @@ import logging as l
 from io import IOBase as io_base_t
 from pathlib import Path as path_t
+from logger_36.constant.html import BODY_PLACEHOLDER, MINIMAL_HTML, TITLE_PLACEHOLDER
 from logger_36.instance.logger import L
@@ -35,19 +36,39 @@ def SaveLOGasHTML(path: str | path_t | io_base_t | None = None) -> None:
         path = path_t(path)
     actual_file = isinstance(path, path_t)
     if actual_file and path.exists():
         L.warning(f'{cannot_save}: File "{path}" already exists.')
         return
-    html = L.past_logs_as_HTML
-    if html is None:
-        L.warning(f"{cannot_save}: No handler could provide an HTML output.")
+    body = "\n".join(map(_HighlightedEvent, L.recorded))
+    html = MINIMAL_HTML.replace(TITLE_PLACEHOLDER, L.name).replace(
+        BODY_PLACEHOLDER, body
+    )
+    if actual_file:
+        with open(path, "w") as accessor:
+            accessor.write(html)
     else:
-        if actual_file:
-            with open(path, "w") as accessor:
-                accessor.write(html)
-        else:
-            path.write(html)
+        path.write(html)
+def _HighlightedEvent(event: tuple[int, str], /) -> str:
+    """"""
+    level, message = event
+    if level == l.DEBUG:
+        color = "BlueViolet"
+    elif level == l.INFO:
+        color = "black"
+    elif level == l.WARNING:
+        color = "gold"
+    elif level == l.ERROR:
+        color = "orange"
+    elif level == l.CRITICAL:
+        color = "red"
+    else:
+        color = "black"
+    return f'<span style="color:{color}">{message}</span>'
 """

logger_36/type/handler.py CHANGED Viewed

@@ -4,57 +4,38 @@ Contributor(s): Eric Debreuve (eric.debreuve@cnrs.fr) since 2023
 SEE COPYRIGHT NOTICE BELOW
 """
-import dataclasses as d
 import logging as l
 import sys as s
 import typing as h
+from pathlib import Path as path_t
-from logger_36.config.message import (
-    LEVEL_CLOSING,
-    LEVEL_OPENING,
-    MESSAGE_MARKER,
-    WHERE_SEPARATOR,
-)
+from logger_36.config.message import FALLBACK_MESSAGE_WIDTH
 from logger_36.constant.error import MEMORY_MEASURE_ERROR
 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.format.message import MessageFromRecord, 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
+from logger_36.type.message import MessageFromRecord_h, RuleWithText_h
 _MEMORY_MEASURE_ERROR = MEMORY_MEASURE_ERROR
-@d.dataclass(slots=True, repr=False, eq=False)
-class handler_extension_t:
-    name: str | None = None
-    should_store_memory_usage: bool = False
-    message_width: int = -1
-    MessageFromRecord: MessageFromRecord_h = d.field(init=False)
+class _base_t:
+    kind: h.ClassVar[str] = ""  # See logger_36.constant.handler.handler_codes_h.
-    handler: d.InitVar[l.Handler | None] = None
-    level: d.InitVar[int] = l.NOTSET
-    formatter: d.InitVar[l.Formatter | None] = None
-    def __post_init__(
-        self, handler: l.Handler | None, level: int, formatter: l.Formatter | None
+    def __init__(
+        self, name: str | None, should_store_memory_usage: bool, message_width: int
     ) -> None:
+        """"""
+        self.name = name
+        self.should_store_memory_usage = should_store_memory_usage
+        self.message_width = message_width
+        #
+        self.MessageFromRecord: MessageFromRecord_h | None = None
+        self.__post_init__()
+    def __post_init__(self) -> None:
         """"""
         global _MEMORY_MEASURE_ERROR
@@ -76,81 +57,95 @@ class handler_extension_t:
                 s.__stderr__.write(_MEMORY_MEASURE_ERROR + "\n")
                 _MEMORY_MEASURE_ERROR = None
-        handler.setLevel(level)
+        if 0 < self.message_width < FALLBACK_MESSAGE_WIDTH:
+            self.message_width = FALLBACK_MESSAGE_WIDTH
-        if 0 < self.message_width < 5:
-            self.message_width = 5
-        if formatter is None:
-            self.MessageFromRecord = self._MessageFromRecord
-        else:
-            handler.setFormatter(formatter)
-            self.MessageFromRecord = handler.formatter.format
+    @classmethod
+    def New(cls, **kwargs) -> h.Self:
+        """
+        Interest: default arguments, no prescribed argument order, variable argument list.
+        """
+        raise NotImplementedError
-    def _MessageFromRecord(
-        self,
-        record: l.LogRecord,
-        /,
-        *,
-        PreProcessed: h.Callable[[str], str] | None = None,
-    ) -> str:
+    def LogAsIs(self, message: str, /) -> None:
         """
-        See logger_36.catalog.handler.README.txt.
+        See documentation of
+        logger_36.catalog.handler.generic.generic_handler_t.LogAsIs.
         """
-        message = record.msg
-        if PreProcessed is not None:
-            message = PreProcessed(message)
-        if (self.message_width <= 0) or (message.__len__() <= self.message_width):
-            if "\n" in message:
-                message = NEXT_LINE_PROLOGUE.join(message.splitlines())
-        else:
-            if "\n" in message:
-                lines = _WrappedLines(message.splitlines(), self.message_width)
-            else:
-                lines = _WrappedLines([message], self.message_width)
-            message = NEXT_LINE_PROLOGUE.join(lines)
-        if (where := getattr(record, "where", None)) is None:
-            where = ""
-        else:
-            where = f"{NEXT_LINE_PROLOGUE}{WHERE_SEPARATOR} {where}"
-        return (
-            f"{record.when_or_elapsed}"
-            f"{LEVEL_OPENING}{record.level_first_letter}{LEVEL_CLOSING} "
-            f"{MESSAGE_MARKER} {message}{where}"
-        )
-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)
+        raise NotImplementedError
-        output.append(line)
+    def DisplayRule(self, /, *, text: str | None = None, color: str = "black") -> None:
+        """"""
+        raise NotImplementedError
-    return output
+class handler_t(l.Handler, _base_t):
+    def __init__(
+        self,
+        name: str | None,
+        should_store_memory_usage: bool,
+        message_width: int,
+        level: int,
+        formatter: l.Formatter | None,
+        *_,
+    ) -> None:
+        """"""
+        l.Handler.__init__(self)
+        _base_t.__init__(self, name, should_store_memory_usage, message_width)
+        __post_init__(self, level, formatter)
+class file_handler_t(l.FileHandler, _base_t):
+    def __init__(
+        self,
+        name: str | None,
+        should_store_memory_usage: bool,
+        message_width: int,
+        level: int,
+        formatter: l.Formatter | None,
+        path: str | path_t | None,
+        *_,
+    ) -> None:
+        """"""
+        if path is None:
+            raise ValueError("Missing file or folder.")
+        if isinstance(path, str):
+            path = path_t(path)
+        if path.exists():
+            raise ValueError(f"File or folder already exists: {path}.")
+        l.FileHandler.__init__(self, path)
+        _base_t.__init__(self, name, should_store_memory_usage, message_width)
+        __post_init__(self, level, formatter)
+any_handler_t = handler_t | file_handler_t
+def __post_init__(
+    handler: any_handler_t, level: int, formatter: l.Formatter | None
+) -> None:
+    """"""
+    handler.setLevel(level)
+    if formatter is None:
+        handler.MessageFromRecord = MessageFromRecord
+    else:
+        handler.setFormatter(formatter)
+        _MessageFromRecordRaw = handler.formatter.format
+        def _MessageFromRecord(
+            record: l.LogRecord,
+            _: RuleWithText_h,
+            /,
+            *,
+            line_width: int = 0,
+            PreProcessed: h.Callable[[str], str] | None = None,
+        ) -> tuple[str, bool]:
+            #
+            return _MessageFromRecordRaw(record), False
+        handler.MessageFromRecord = _MessageFromRecord
 """

logger-36 2025.12__py3-none-any.whl → 2025.14__py3-none-any.whl

logger-36 2025.12py3-none-any.whl → 2025.14py3-none-any.whl