logger-36 2024.21__py3-none-any.whl → 2024.23__py3-none-any.whl

logger_36/constant/issue.py

@@ -9,6 +9,8 @@ import typing as h
 order_h = h.Literal["when", "context"]
 ORDER: tuple[str, ...] = h.get_args(order_h)
 
+ISSUE_LEVEL_SEPARATOR = "#"
+
 """
 COPYRIGHT NOTICE
 

logger_36/constant/message.py

@@ -19,7 +19,7 @@ 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) * " "
 
-expected_op_h = h.Literal[": ", "=", "!=", ">=", "<="]
+expected_op_h = h.Literal[":", ": ", "=", "!=", ">=", "<="]
 EXPECTED_OP: tuple[str, ...] = h.get_args(expected_op_h)
 
 """

logger_36/task/format/message.py

@@ -4,6 +4,7 @@ Contributor(s): Eric Debreuve (eric.debreuve@cnrs.fr) since 2023
 SEE COPYRIGHT NOTICE BELOW
 """
 
+import difflib as diff
 import typing as h
 
 from logger_36.config.message import (
@@ -40,6 +41,7 @@ def FormattedMessage(
     *,
     actual: h.Any = NOT_PASSED,
     expected: h.Any | None = None,
+    expected_is_choices: bool = False,
     expected_op: expected_op_h = "=",
     with_final_dot: bool = True,
 ) -> str:
@@ -64,27 +66,35 @@ def FormattedMessage(
 
     if message[-1] == ".":
         message = message[:-1]
-    actual = _FormattedValue(actual)
-    expected = _FormattedValue(expected)
-
+    expected = _FormattedExpected(expected_op, expected, expected_is_choices, actual)
     if with_final_dot:
         dot = "."
     else:
         dot = ""
-    return f"{message}: Actual={actual}; Expected{expected_op}{expected}{dot}"
-
 
-def _FormattedValue(value: h.Any, /, *, should_format_str: bool = True) -> str:
-    """"""
-    if value is None:
-        return "None"
+    return f"{message}: Actual={actual}:{type(actual).__name__}; {expected}{dot}"
 
-    if isinstance(value, str):
-        if should_format_str:
-            return f'"{value}"'
-        return value
 
-    return str(value)
+def _FormattedExpected(
+    operator: str, expected: h.Any, expected_is_choices: bool, actual: h.Any, /
+) -> str:
+    """"""
+    if isinstance(expected, h.Sequence) and expected_is_choices:
+        close_matches = diff.get_close_matches(actual, expected)
+        if close_matches.__len__() > 0:
+            close_matches = ", ".join(close_matches)
+            return f"Close matche(s): {close_matches}"
+        else:
+            expected = ", ".join(map(str, expected))
+            return f"Valid values: {expected}"
+    else:
+        if operator == "=":
+            stripe = f":{type(expected).__name__}"
+        else:
+            stripe = ""
+            if operator == ":":
+                operator = ": "
+        return f"Expected{operator}{expected}{stripe}"
 
 
 """

logger_36/type/issue.py

@@ -4,10 +4,12 @@ Contributor(s): Eric Debreuve (eric.debreuve@cnrs.fr) since 2023
 SEE COPYRIGHT NOTICE BELOW
 """
 
+import logging as lggg
 import typing as h
 
 from logger_36.config.issue import ISSUE_BASE_CONTEXT
 from logger_36.constant.generic import NOT_PASSED
+from logger_36.constant.issue import ISSUE_LEVEL_SEPARATOR
 from logger_36.constant.message import expected_op_h
 from logger_36.task.format.message import FormattedMessage
 
@@ -20,8 +22,10 @@ def NewIssue(
     message: str,
     /,
     *,
+    level: int = lggg.ERROR,
     actual: h.Any = NOT_PASSED,
     expected: h.Any | None = None,
+    expected_is_choices: bool = False,
     expected_op: expected_op_h = "=",
     with_final_dot: bool = True,
 ) -> issue_t:
@@ -32,11 +36,12 @@ def NewIssue(
         message,
         actual=actual,
         expected=expected,
+        expected_is_choices=expected_is_choices,
         expected_op=expected_op,
         with_final_dot=with_final_dot,
     )
 
-    return f"{context}{separator}{message}"
+    return f"{level}{ISSUE_LEVEL_SEPARATOR}{context}{separator}{message}"
 
 
 """

logger_36/type/logger.py

@@ -17,7 +17,7 @@ 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
 from logger_36.constant.generic import NOT_PASSED
-from logger_36.constant.issue import ORDER, order_h
+from logger_36.constant.issue import ISSUE_LEVEL_SEPARATOR, ORDER, order_h
 from logger_36.constant.logger import (
     HIDE_WHERE_KWARG,
     LOGGER_NAME,
@@ -221,11 +221,35 @@ class logger_t(lggg.Logger):
             # __post_init__ set self.exit_on_critical if self.exit_on_error.
             sstm.exit(1)
 
-    def error_for_exception(
+    def Log(
+        self,
+        message: str,
+        /,
+        *,
+        level: int = lggg.ERROR,
+        actual: h.Any = NOT_PASSED,
+        expected: h.Any | None = None,
+        expected_is_choices: bool = False,
+        expected_op: expected_op_h = "=",
+        with_final_dot: bool = True,
+    ) -> None:
+        """"""
+        message = FormattedMessage(
+            message,
+            actual=actual,
+            expected=expected,
+            expected_is_choices=expected_is_choices,
+            expected_op=expected_op,
+            with_final_dot=with_final_dot,
+        )
+        self.log(level, message)
+
+    def LogException(
         self,
         exception: Exception,
         /,
         *,
+        level: int = lggg.ERROR,
         should_remove_caller: bool = False,
     ) -> None:
         """"""
@@ -233,9 +257,12 @@ class logger_t(lggg.Logger):
         if should_remove_caller:
             message = "\n".join(lines[:1] + lines[2:])
         else:
+            # TODO: Explain:
+            #     - Why it's not: "\n".join(lines)?
+            #     - Why adding exception name here and not when removing caller?
             formatted = "".join(lines)
             message = f"{type(exception).__name__}:\n{formatted}"
-        self.error(message)
+        self.log(level, message)
 
     def AddContextLevel(self, new_level: str, /) -> None:
         """"""
@@ -255,8 +282,10 @@ class logger_t(lggg.Logger):
         message: str,
         /,
         *,
+        level: int = lggg.ERROR,
         actual: h.Any = NOT_PASSED,
         expected: h.Any | None = None,
+        expected_is_choices: bool = False,
         expected_op: expected_op_h = "=",
         with_final_dot: bool = False,
     ) -> None:
@@ -266,8 +295,10 @@ class logger_t(lggg.Logger):
             context,
             ISSUE_CONTEXT_END,
             message,
+            level=level,
             actual=actual,
             expected=expected,
+            expected_is_choices=expected_is_choices,
             expected_op=expected_op,
             with_final_dot=with_final_dot,
         )
@@ -280,12 +311,15 @@ class logger_t(lggg.Logger):
 
     def CommitIssues(
         self,
-        level: int | type[Exception],
         /,
         *,
         order: order_h = "when",
+        unified: bool = False,
     ) -> None:
-        """"""
+        """
+        Note that issues after an issue with a level triggering process exit will not be
+        logged.
+        """
         if not self.has_staged_issues:
             return
 
@@ -302,22 +336,28 @@ class logger_t(lggg.Logger):
             issues = self.staged_issues
         else:  # order == "context"
             issues = sorted(self.staged_issues, key=lambda _elm: _elm.context)
-        issues = "\n".join(issues)
-
-        if isinstance(level, type) and issubclass(level, Exception):
-            try:
-                raise level("\n" + issues)
-            except Exception as exception:
-                lines = ["Traceback (most recent call last):"] + tcbk.format_stack()[
-                    :-1
-                ]
-                lines[-1] = lines[-1][:-1]
-                lines.extend(tcbk.format_exception_only(exception))
-                print("\n".join(lines), file=sstm.stderr)
-                sstm.exit(1)
-
-        level: int
-        self.log(level, issues, stacklevel=2)
+        """
+        Format issues as an exception:
+        try:
+            raise ValueError("\n" + "\n".join(issues))
+        except ValueError as exception:
+            lines = ["Traceback (most recent call last):"] + tcbk.format_stack()[:-1]
+            lines[-1] = lines[-1][:-1]
+            lines.extend(tcbk.format_exception_only(exception))
+            formatted = "\n".join(lines)
+        """
+
+        if unified:
+            level, _ = issues[0].split(ISSUE_LEVEL_SEPARATOR, maxsplit=1)
+            wo_level = []
+            for issue in issues:
+                _, issue = issue.split(ISSUE_LEVEL_SEPARATOR, maxsplit=1)
+                wo_level.append(issue)
+            self.log(int(level), "\n".join(wo_level), stacklevel=2)
+        else:
+            for issue in issues:
+                level, issue = issue.split(ISSUE_LEVEL_SEPARATOR, maxsplit=1)
+                self.log(int(level), issue, stacklevel=2)
         self.staged_issues.clear()
 
     def ShowMessage(self, message: str, /) -> 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.21"
+__version__ = "2024.23"
 
 """
 COPYRIGHT NOTICE

{logger_36-2024.21.dist-info → logger_36-2024.23.dist-info}/METADATA

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

@@ -5,7 +5,7 @@ logger_36/logger.py,sha256=7LJtdT7TmfFsn6r34iTr6OGvEjXlU6hKXEO2c5Lm2zY,2386
 logger_36/logger_gpu.py,sha256=YYFk6aYQrBDJfxQaDm-ar16T6SlOSL6jJWTOgvpF4EU,2244
 logger_36/measure.py,sha256=P507VNbVKAf4jYGnGX-3rlDrVbrYP0ZD3nxFmAFvhyI,2404
 logger_36/storage.py,sha256=O8pDmiL0B3LJpKrhi8a9IMBXs6MwW6r1bMUn_cSDAaY,2246
-logger_36/version.py,sha256=rTDQY_iaCr8FcZO-_ELLxzcbp57fGX9nsGWkY7plJmk,2206
+logger_36/version.py,sha256=4_FGnjQh_s8oYEhxb9KRp7Q6xpIM8ntNmNoRxRRQqfo,2206
 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=Ti1k2E1ox4egzicghTb9Wv30xiWaBbWwe8ouopJsujY,8792
@@ -23,10 +23,10 @@ logger_36/config/system.py,sha256=HD8ZuwsXhEAExeZrww8YoDkQGMs4T5RDqQMb1W4qVgc,24
 logger_36/constant/error.py,sha256=1gdnCwUu3d3ThL4AKxzjn7ijSTBWlr2g-8cAKbubl4A,2825
 logger_36/constant/generic.py,sha256=t6aRb66_NHwMhR1p7BZ4QXTU2jpLz-H5YAL4PuMtKx8,2244
 logger_36/constant/handler.py,sha256=HM8qCSEMGNMCzddjUUNBPGL-3d0qU-EmG5eW4ZQHW6A,2311
-logger_36/constant/issue.py,sha256=48c3QGNzgRcvQOenlp77_wAU4znZfLkQEdT2oE_CvMs,2286
+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=RKQL-YmEDds5q7HuHTeDebz7_h3zWDX0PNxu-RTwL2I,2714
+logger_36/constant/message.py,sha256=JMnCmW4j-oa-Cs1iZCJ5yAG6V4BzjLCGRIvEw6pQTtU,2719
 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
@@ -34,15 +34,15 @@ logger_36/instance/loggers.py,sha256=RCWpC1NPAf6vXnFc9NqsSALv-x-FEzcH6k_OlxTxeQk
 logger_36/task/inspection.py,sha256=f9VkVrwMJ_ixV9rFu3XUNpmCbEgoo1tssqd2nMeGYLI,5028
 logger_36/task/storage.py,sha256=XaSeu-iBCa0N8HNpwCV7cLprj-lbOJocpTIKUgSOvsc,5668
 logger_36/task/format/memory.py,sha256=ECOdHjdxIqXivOwtcmwpLDMYUrutIeOTCn1L4d3-U8k,4241
-logger_36/task/format/message.py,sha256=X9qtXPxhXgCIjnRYBJn93vj4rW4I-7dJP6LaXD5Qu2o,4142
+logger_36/task/format/message.py,sha256=CP1E8tNY1hkc_dujrxTV2DW2iGopx4ew4xV_HgwOlDw,4705
 logger_36/task/format/rule.py,sha256=YEe8wG_QLy9vRZqmT2bWlvKT-Dxp4pGaZVmEuwwODyE,2598
 logger_36/task/measure/chronos.py,sha256=t-y0bVm1SmF-3wI9pR9Bp6-qzVlsE94fZTZr5a_hZUA,2884
 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=cB8pSSJg9aqFPQ6yJr4TC2kJbngKGK8Hyq4ATBm6jAc,2973
-logger_36/type/logger.py,sha256=W6U0t_M6juGoc5cGb9vdwk29LhNeg2Sa-VeOKiWJrac,15234
+logger_36/type/issue.py,sha256=Y7OCLCzVt6Yvkecwj8HXLdZjg33oMxexc9XkYHzUhh4,3202
+logger_36/type/logger.py,sha256=1PNs4sGZM7JvIMuveU-2X4TL9CbrIm7WSHq54SjSpRw,16653
 logger_36/type/loggers.py,sha256=znqxWBnfQxvkg3VUfbTUvt3S6Kq0DAzWWepxQDt9suI,2871
-logger_36-2024.21.dist-info/METADATA,sha256=fsvDva8-byjx5YqWdp2yf83uIjNA04WYyBjTcdVAgbY,6276
-logger_36-2024.21.dist-info/WHEEL,sha256=HiCZjzuy6Dw0hdX5R3LCFPDmFS4BWl8H-8W39XfmgX4,91
-logger_36-2024.21.dist-info/top_level.txt,sha256=sM95BTMWmslEEgR_1pzwZsOeSp8C_QBiu8ImbFr0XLc,10
-logger_36-2024.21.dist-info/RECORD,,
+logger_36-2024.23.dist-info/METADATA,sha256=ycisLVTVoTOgt6tPDkBqwhEUSZhCVtqmEM_MAl6vEMQ,6276
+logger_36-2024.23.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+logger_36-2024.23.dist-info/top_level.txt,sha256=sM95BTMWmslEEgR_1pzwZsOeSp8C_QBiu8ImbFr0XLc,10
+logger_36-2024.23.dist-info/RECORD,,

{logger_36-2024.21.dist-info → logger_36-2024.23.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (72.2.0)
+Generator: setuptools (74.1.2)
 Root-Is-Purelib: true
 Tag: py3-none-any