logger-36 2024.4__py3-none-any.whl → 2024.6__py3-none-any.whl

logger_36/catalog/handler/console_rich.py

@@ -56,6 +56,21 @@ from rich.console import Console as console_t
 from rich.console import RenderableType as renderable_t
 from rich.markup import escape as EscapedForRich
 from rich.text import Text as text_t
+from rich.traceback import install as InstallTracebackHandler
+
+
+_COMMON_TRACEBACK_ARGUMENTS = ("theme", "width")
+_EXCLUSIVE_TRACEBACK_ARGUMENTS = (
+    "extra_lines",
+    "indent_guides",
+    "locals_hide_dunder",
+    "locals_hide_sunder",
+    "locals_max_length",
+    "locals_max_string",
+    "max_frames" "show_locals",
+    "suppress",
+    "word_wrap",
+)
 
 
 @dtcl.dataclass(slots=True, repr=False, eq=False)
@@ -69,6 +84,7 @@ class console_rich_handler_t(lggg.Handler):
     show_where: dtcl.InitVar[bool] = True
     show_memory_usage: dtcl.InitVar[bool] = False
     formatter: dtcl.InitVar[lggg.Formatter | None] = None
+    should_install_traceback: dtcl.InitVar[bool] = False
 
     rich_kwargs: dtcl.InitVar[dict[str, h.Any] | None] = None
 
@@ -79,6 +95,7 @@ class console_rich_handler_t(lggg.Handler):
         show_where: bool,
         show_memory_usage: bool,
         formatter: lggg.Formatter | None,
+        should_install_traceback: bool,
         rich_kwargs: dict[str, h.Any] | None,
     ) -> None:
         """"""
@@ -94,13 +111,27 @@ class console_rich_handler_t(lggg.Handler):
         )
 
         if rich_kwargs is None:
-            rich_kwargs = {}
+            rich_console_kwargs = {}
+        else:
+            rich_console_kwargs = rich_kwargs
+        rich_traceback_kwargs = {}
+        if should_install_traceback:
+            for key in rich_console_kwargs:
+                if key in _COMMON_TRACEBACK_ARGUMENTS:
+                    rich_traceback_kwargs[key] = rich_console_kwargs[key]
+                elif key in _EXCLUSIVE_TRACEBACK_ARGUMENTS:
+                    rich_traceback_kwargs[key] = rich_console_kwargs[key]
+                    del rich_console_kwargs[key]
+
         self.console = console_t(
             highlight=False,
             force_terminal=True,
             record=True,
-            **rich_kwargs,
+            **rich_console_kwargs,
         )
+        if should_install_traceback:
+            rich_traceback_kwargs["console"] = self.console
+            InstallTracebackHandler(**rich_traceback_kwargs)
 
         self.FormattedLines = self.extension.FormattedLines
 

logger_36/main.py

@@ -61,6 +61,7 @@ def AddGenericHandler(
     interface: interface_h,
     /,
     *,
+    logger: lggg.Logger | None = None,
     name: str | None = None,
     level: int = lggg.INFO,
     show_where: bool = True,
@@ -71,6 +72,9 @@ def AddGenericHandler(
     **kwargs,
 ) -> None:
     """"""
+    if logger is None:
+        logger = LOGGER
+
     handler = generic_handler_t(
         name=name,
         level=level,
@@ -81,11 +85,12 @@ def AddGenericHandler(
         rich_kwargs=kwargs,
         interface=interface,
     )
-    LOGGER.AddHandler(handler, should_hold_messages)
+    logger.AddHandler(handler, should_hold_messages)
 
 
 def AddConsoleHandler(
     *,
+    logger: lggg.Logger | None = None,
     name: str | None = None,
     level: int = lggg.INFO,
     show_where: bool = True,
@@ -94,6 +99,9 @@ def AddConsoleHandler(
     should_hold_messages: bool = False,
 ) -> None:
     """"""
+    if logger is None:
+        logger = LOGGER
+
     handler = console_handler_t(
         name=name,
         level=level,
@@ -101,17 +109,19 @@ def AddConsoleHandler(
         show_memory_usage=show_memory_usage,
         formatter=formatter,
     )
-    LOGGER.AddHandler(handler, should_hold_messages)
+    logger.AddHandler(handler, should_hold_messages)
 
 
 def AddRichConsoleHandler(
     *,
+    logger: lggg.Logger | None = None,
     name: str | None = None,
     level: int = lggg.INFO,
     show_where: bool = True,
     show_memory_usage: bool = False,
     formatter: lggg.Formatter | None = None,
     should_hold_messages: bool = False,
+    should_install_traceback: bool = False,
     **kwargs,
 ) -> None:
     """"""
@@ -120,21 +130,26 @@ def AddRichConsoleHandler(
         print(_RICH_ERROR, file=sstm.stderr)
         _RICH_ERROR = None
 
+    if logger is None:
+        logger = LOGGER
+
     handler = console_rich_handler_t(
         name=name,
         level=level,
         show_where=show_where,
         show_memory_usage=show_memory_usage,
         formatter=formatter,
+        should_install_traceback=should_install_traceback,
         rich_kwargs=kwargs,
     )
-    LOGGER.AddHandler(handler, should_hold_messages)
+    logger.AddHandler(handler, should_hold_messages)
 
 
 def AddFileHandler(
     path: str | path_t,
     /,
     *args,
+    logger: lggg.Logger | None = None,
     name: str | None = None,
     level: int = lggg.INFO,
     show_where: bool = True,
@@ -148,6 +163,8 @@ def AddFileHandler(
         path = path_t(path)
     if path.exists():
         raise ValueError(f"File or folder already exists: {path}.")
+    if logger is None:
+        logger = LOGGER
 
     handler = file_handler_t(
         name=name,
@@ -159,16 +176,25 @@ def AddFileHandler(
         handler_args=args,
         handler_kwargs=kwargs,
     )
-    LOGGER.AddHandler(handler, should_hold_messages)
+    logger.AddHandler(handler, should_hold_messages)
 
 
-def SetLOGLevel(level: int, /, *, which: handler_codes_h | str = "a") -> None:
+def SetLOGLevel(
+    level: int,
+    /,
+    *,
+    logger: lggg.Logger | None = None,
+    which: handler_codes_h | str = "a",
+) -> None:
     """
     which: g=generic, c=console, f=file, a=all, str=name.
     """
+    if logger is None:
+        logger = LOGGER
+
     which_is_name = which not in HANDLER_CODES
     found = False
-    for handler in LOGGER.handlers:
+    for handler in logger.handlers:
         if (
             (which == "a")
             or ((which == "g") and isinstance(handler, generic_handler_t))

logger_36/type/logger.py

@@ -296,17 +296,16 @@ class logger_t(lggg.Logger):
             issues = sorted(self.staged_issues, key=lambda _elm: _elm.context)
         issues = "\n".join(issues)
 
-        if issubclass(level, Exception):
+        if isinstance(level, type) and issubclass(level, Exception):
             try:
                 raise level("\n" + issues)
             except Exception as exception:
-                traceback = "Traceback (most recent call last):\n" + "\n".join(
-                    tbck.format_stack()[:-1]
-                )
-                print(traceback[:-1], file=sstm.stderr)
-                print(
-                    "\n".join(tbck.format_exception_only(exception)), file=sstm.stderr
-                )
+                lines = ["Traceback (most recent call last):"] + tbck.format_stack()[
+                    :-1
+                ]
+                lines[-1] = lines[-1][:-1]
+                lines.extend(tbck.format_exception_only(exception))
+                print("\n".join(lines), file=sstm.stderr)
                 sstm.exit(1)
 
         self.log(level, issues, **HIDE_WHERE_KWARG)

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.4"
+__version__ = "2024.6"

{logger_36-2024.4.dist-info → logger_36-2024.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: logger-36
-Version: 2024.4
+Version: 2024.6
 Summary: Simple logger with a catalog of handlers
 Home-page: https://src.koda.cnrs.fr/eric.debreuve/logger-36/
 Author: Eric Debreuve
@@ -12,8 +12,8 @@ Keywords: log,warning,error
 Classifier: Topic :: Software Development
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: CEA CNRS Inria Logiciel Libre License, version 2.1 (CeCILL-2.1)
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Development Status :: 4 - Beta
+Classifier: Programming Language :: Python :: 3
+Classifier: Development Status :: 5 - Production/Stable
 Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
 

{logger_36-2024.4.dist-info → logger_36-2024.6.dist-info}/RECORD

@@ -1,10 +1,10 @@
 logger_36/__init__.py,sha256=-VGyte6TD6SWU4jBXUjur_xU1R1Asha5KXEwDNmGJ6Q,1756
 logger_36/instance.py,sha256=NQlDAyXV3TNekX9xj9V7JMePmsa2DWnTDaVzh5dcyGM,1616
-logger_36/main.py,sha256=hj3hctMBHJbPWw1078tJ_zOU-6-kEGCzMgHwpWY5ElA,6134
-logger_36/version.py,sha256=b61fTunI_uzuupVlwY9m5iA0uH2qcxIRpuMvNp6g3BQ,1575
+logger_36/main.py,sha256=kdv79ZTpapb9ltLoKfSfR89CdPxDlizUJs6IctSRTqE,6690
+logger_36/version.py,sha256=4cJ_wNkTKxQDHDz6-DuN3-53TI6P_28cAcNpeuDUmCQ,1575
 logger_36/catalog/config/console_rich.py,sha256=jJnYXPDsMCTu8zny2X3NdeyKFCfhJupberqIBxyv3LA,2030
 logger_36/catalog/handler/console.py,sha256=PnaCWJsXN-x_-X8i-4o4HWys-7K0A83s4kIdtmDz3AQ,3092
-logger_36/catalog/handler/console_rich.py,sha256=YqKyKwHoYCEVnW1S87NDu3ReTCIzSdYgC-20-813TFQ,5395
+logger_36/catalog/handler/console_rich.py,sha256=pTczLjsEB78DT4ph57yLeQKPTcJVXpc3Q99d_I4YOk0,6512
 logger_36/catalog/handler/file.py,sha256=BAxA-ZQAikmH0R9Ia3mbSXf-Z60-FfA4ElOVjjmanS0,3507
 logger_36/catalog/handler/generic.py,sha256=1pAmP5vOxBPWhpqoBRDNIc3q14dIDsj7JbX-VqcgUbM,5931
 logger_36/catalog/logging/chronos.py,sha256=5SWyRUhwwKeJg3NPf9jkCqtKc7b_4x58Slbq2iMA8kE,1814
@@ -32,8 +32,8 @@ logger_36/task/measure/chronos.py,sha256=qT80jxZm_dAg2P4WkfU0L3PRvRojT21Ps3DtNYq
 logger_36/task/measure/memory.py,sha256=1f1X-XHd_58LJYJ0Ok5TGIagnf0k5F39IFqWHN2Ojas,1874
 logger_36/type/extension.py,sha256=fsYx0wT1bR6DtpM2VnaxsM0MFv2vBLROgRSCs4duasY,5198
 logger_36/type/issue.py,sha256=T1WFtc8Js1OChYkIHQiOP825Dcb9atpEprLWaPTxAHA,2151
-logger_36/type/logger.py,sha256=jCmY-pxPT-4XLUpBNd81mPHasJZNVl5CaLEjLZyrCco,12731
-logger_36-2024.4.dist-info/METADATA,sha256=_zL8RSuzNN7ruojiwBQol923L0t0oTZ9pcrGc1ELvtc,4236
-logger_36-2024.4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-logger_36-2024.4.dist-info/top_level.txt,sha256=sM95BTMWmslEEgR_1pzwZsOeSp8C_QBiu8ImbFr0XLc,10
-logger_36-2024.4.dist-info/RECORD,,
+logger_36/type/logger.py,sha256=t1pXc82F8wF-g-qyh7VxyoFBp0MKgtpOoyDznem9L6Q,12729
+logger_36-2024.6.dist-info/METADATA,sha256=HPZZUBLa9QTUkXToFVDxwVGXx47snsdOQ1BUwxX0xdM,4246
+logger_36-2024.6.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+logger_36-2024.6.dist-info/top_level.txt,sha256=sM95BTMWmslEEgR_1pzwZsOeSp8C_QBiu8ImbFr0XLc,10
+logger_36-2024.6.dist-info/RECORD,,