logger-36 2024.9__py3-none-any.whl → 2024.11__py3-none-any.whl

logger_36/catalog/config/console_rich.py

@@ -29,6 +29,9 @@
 # The fact that you are presently reading this means that you have had
 # knowledge of the CeCILL license and that you accept its terms.
 
+"""
+Colors: See https://rich.readthedocs.io/en/stable/appendix/colors.html.
+"""
 import logging as lggg
 
 from rich.color import Color as color_t
@@ -42,7 +45,7 @@ LEVEL_COLOR: dict[int, str | style_t] = {
     lggg.ERROR: "orange1",
     lggg.CRITICAL: "red",
 }
-ACTUAL_COLOR: str = "red"
+ACTUAL_COLOR: str = "indian_red"
 EXPECTED_COLOR: str = "green"
 ELAPSED_TIME_COLOR: str = "green"
 

logger_36/catalog/logging/chronos.py

@@ -29,7 +29,7 @@
 # The fact that you are presently reading this means that you have had
 # knowledge of the CeCILL license and that you accept its terms.
 
-from logger_36.constant.handler import HIDE_WHERE_KWARG
+from logger_36.constant.logger import HIDE_WHERE_KWARG
 from logger_36.instance import LOGGER
 from logger_36.task.measure.chronos import ElapsedTime
 

logger_36/catalog/logging/gpu.py

@@ -29,19 +29,30 @@
 # The fact that you are presently reading this means that you have had
 # knowledge of the CeCILL license and that you accept its terms.
 
-from logger_36.constant.handler import HIDE_WHERE_KWARG
+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 import LOGGER
 
 try:
     import tensorflow as tsfl
     import tensorrt as tsrt
+
+    _GPU_LOGGING_ERROR = None
 except ModuleNotFoundError:
     tsfl = tsrt = None
+    _GPU_LOGGING_ERROR = GPU_LOGGING_ERROR
 
 
 def LogGPURelatedDetails() -> None:
     """"""
+    global _GPU_LOGGING_ERROR
+
     if None in (tsfl, tsrt):
+        if _GPU_LOGGING_ERROR is not None:
+            print(_GPU_LOGGING_ERROR, file=sstm.stderr)
+            _GPU_LOGGING_ERROR = None
         return
 
     system_details = tsfl.sysconfig.get_build_info()

logger_36/constant/error.py

@@ -0,0 +1,49 @@
+# Copyright CNRS/Inria/UniCA
+# Contributor(s): Eric Debreuve (since 2023)
+#
+# eric.debreuve@cnrs.fr
+#
+# 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.
+
+GPU_LOGGING_ERROR = (
+    "GPU details cannot be logged because the Tensorflow and/or Tensorrt package(s) "
+    "(https://www.tensorflow.org/, https://developer.nvidia.com/tensorrt)"
+    "is/are not installed or not importable."
+)
+
+MEMORY_MEASURE_ERROR = (
+    "Memory usage cannot be shown because the Psutil package "
+    "(https://psutil.readthedocs.io/en/latest/)"
+    "is not installed or not importable."
+)
+
+MISSING_RICH_ERROR = (
+    "The Rich console handler is not available because the Rich package "
+    "(https://rich.readthedocs.io/en/stable/) "
+    "is not installed or not importable. "
+    "Falling back to the raw console."
+)

logger_36/constant/memory.py

@@ -34,6 +34,4 @@ import typing as h
 storage_units_h = h.Literal["b", "k", "m", "g", "a"]
 STORAGE_UNITS: tuple[str, ...] = h.get_args(storage_units_h)
 
-MEMORY_MEASURE_ERROR = (
-    "Cannot show memory usage: " 'Package "psutil" not installed or importable.'
-)
+UNKNOWN_MEMORY_USAGE = -1

logger_36/main.py

@@ -33,28 +33,24 @@ import logging as lggg
 import sys as sstm
 from pathlib import Path as path_t
 
+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, interface_h
+from logger_36.constant.error import MISSING_RICH_ERROR
+from logger_36.constant.handler import HANDLER_CODES, handler_codes_h
+from logger_36.instance import LOGGER
+from logger_36.task.format.message import FormattedMessage
+
 try:
     from logger_36.catalog.handler.console_rich import console_rich_handler_t
 
-    _RICH_ERROR = None
+    _MISSING_RICH_ERROR = None
 except ModuleNotFoundError:
     from logger_36.catalog.handler.console import (
         console_handler_t as console_rich_handler_t,
     )
 
-    _RICH_ERROR = (
-        "The Rich console handler is not available, "
-        "probably because the Rich package "
-        "(https://rich.readthedocs.io/en/stable/index.html) "
-        "is not installed, or not loadable. "
-        "Falling back to the raw console."
-    )
-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, interface_h
-from logger_36.constant.handler import HANDLER_CODES, handler_codes_h
-from logger_36.instance import LOGGER
-from logger_36.task.format.message import FormattedMessage
+    _MISSING_RICH_ERROR = MISSING_RICH_ERROR
 
 
 def AddGenericHandler(
@@ -125,10 +121,10 @@ def AddRichConsoleHandler(
     **kwargs,
 ) -> None:
     """"""
-    global _RICH_ERROR
-    if _RICH_ERROR is not None:
-        print(_RICH_ERROR, file=sstm.stderr)
-        _RICH_ERROR = None
+    global _MISSING_RICH_ERROR
+    if _MISSING_RICH_ERROR is not None:
+        print(_MISSING_RICH_ERROR, file=sstm.stderr)
+        _MISSING_RICH_ERROR = None
 
     if logger is None:
         logger = LOGGER

logger_36/type/extension.py

@@ -33,16 +33,20 @@ import dataclasses as dtcl
 import logging as lggg
 import sys as sstm
 import typing as h
+from os import sep as FOLDER_SEPARATOR
+from pathlib import Path as path_t
 
 from logger_36.config.message import TIME_FORMAT, WHERE_FORMAT
+from logger_36.constant.error import MEMORY_MEASURE_ERROR
 from logger_36.constant.handler import HANDLER_CODES
-from logger_36.constant.memory import MEMORY_MEASURE_ERROR
 from logger_36.constant.message import NEXT_LINE_PROLOGUE
 from logger_36.constant.record import HIDE_WHERE_ATTR, SHOW_WHERE_ATTR
 from logger_36.task.format.message import FormattedMessage, MessageFormat
 from logger_36.task.measure.chronos import TimeStamp
 from logger_36.task.measure.memory import CanCheckMemory
 
+_MEMORY_MEASURE_ERROR = MEMORY_MEASURE_ERROR
+
 
 @dtcl.dataclass(slots=True, repr=False, eq=False)
 class handler_extension_t:
@@ -59,6 +63,8 @@ class handler_extension_t:
         self, handler: lggg.Handler | None, level: int, formatter: lggg.Formatter | None
     ) -> None:
         """"""
+        global _MEMORY_MEASURE_ERROR
+
         if self.name in HANDLER_CODES:
             raise ValueError(
                 FormattedMessage(
@@ -73,7 +79,9 @@ class handler_extension_t:
 
         if self.show_memory_usage and not CanCheckMemory():
             self.show_memory_usage = False
-            print(MEMORY_MEASURE_ERROR, file=sstm.stderr)
+            if _MEMORY_MEASURE_ERROR is not None:
+                print(_MEMORY_MEASURE_ERROR, file=sstm.stderr)
+                _MEMORY_MEASURE_ERROR = None
 
         handler.setLevel(level)
 
@@ -117,8 +125,20 @@ class handler_extension_t:
             if hide_where:
                 record.where = ""
             else:
+                module = path_t(record.pathname)
+                path_was_found = False
+                for path in sstm.path:
+                    if module.is_relative_to(path):
+                        module = module.relative_to(path)
+                        path_was_found = True
+                        break
+                if path_was_found:
+                    module = str(module.parent / module.stem)
+                    module = module.replace(FOLDER_SEPARATOR, ".")
+                else:
+                    module = record.module
                 record.where = WHERE_FORMAT.format(
-                    module=record.module, funcName=record.funcName, lineno=record.lineno
+                    module=module, funcName=record.funcName, lineno=record.lineno
                 )
         first_line = self.FormattedRecord(record).replace("\t", " ")
 

logger_36/type/logger.py

@@ -52,6 +52,7 @@ from logger_36.constant.logger import (
     WARNING_TYPE_COMPILED_PATTERN,
     logger_handle_h,
 )
+from logger_36.constant.memory import UNKNOWN_MEMORY_USAGE
 from logger_36.constant.record import SHOW_MEMORY_ATTR, SHOW_W_RULE_ATTR
 from logger_36.task.format.memory import (
     FormattedUsageWithAutoUnit as FormattedMemoryUsage,
@@ -103,7 +104,6 @@ class logger_t(lggg.Logger):
         """
         if self.intercepted_wrn_handle is None:
             logger = lggg.getLogger(WARNING_LOGGER_NAME)
-
             self.intercepted_wrn_handle = logger.handle
             logger.handle = t.MethodType(_HandleForWarnings(self), logger)
 
@@ -114,7 +114,6 @@ class logger_t(lggg.Logger):
         """"""
         if self.intercepted_wrn_handle is not None:
             logger = lggg.getLogger(WARNING_LOGGER_NAME)
-
             logger.handle = self.intercepted_wrn_handle
             self.intercepted_wrn_handle = None
 
@@ -146,8 +145,9 @@ class logger_t(lggg.Logger):
 
             intercepted = sorted(self.intercepted_log_handles.keys())
             if intercepted.__len__() > 0:
+                as_str = ", ".join(intercepted)
                 self.info(
-                    f"Now Intercepting LOGs from: {str(intercepted)[1:-1]}",
+                    f"Now Intercepting LOGs from: {as_str}",
                     **HIDE_WHERE_KWARG,
                 )
         elif self.intercepted_log_handles.__len__() > 0:
@@ -160,15 +160,20 @@ class logger_t(lggg.Logger):
     @property
     def max_memory_usage(self) -> int:
         """"""
-        return max(tuple(zip(*self.memory_usages))[1])
+        if self.memory_usages.__len__() > 0:
+            return max(tuple(zip(*self.memory_usages))[1])
+        return UNKNOWN_MEMORY_USAGE
 
     @property
     def max_memory_usage_full(self) -> tuple[str, int]:
         """"""
-        where_s, usages = zip(*self.memory_usages)
-        max_usage = max(usages)
+        if self.memory_usages.__len__() > 0:
+            where_s, usages = zip(*self.memory_usages)
+            max_usage = max(usages)
 
-        return where_s[usages.index(max_usage)], max_usage
+            return where_s[usages.index(max_usage)], max_usage
+
+        return "?", UNKNOWN_MEMORY_USAGE
 
     def AddHandler(self, handler: lggg.Handler, should_hold_messages: bool, /) -> None:
         """"""
@@ -309,7 +314,7 @@ class logger_t(lggg.Logger):
                 print("\n".join(lines), file=sstm.stderr)
                 sstm.exit(1)
 
-        self.log(level, issues, **HIDE_WHERE_KWARG)
+        self.log(level, issues, stacklevel=2)
         self.staged_issues.clear()
 
     def __enter__(self) -> None:
@@ -332,16 +337,25 @@ def _HandleForWarnings(interceptor: lggg.Logger, /) -> logger_handle_h:
     """"""
 
     def handle_p(_: lggg.Logger, record: lggg.LogRecord, /) -> None:
-        pieces = WARNING_TYPE_COMPILED_PATTERN.match(record.msg).group
-        module = path_t(pieces(1)).stem
-        line = pieces(2)
-        kind = pieces(3)
-        message = pieces(4)
+        pieces = WARNING_TYPE_COMPILED_PATTERN.match(record.msg)
+        if pieces is None:
+            # The warning message does not follow the default format.
+            interceptor.handle(record)
+            return
+
+        GetPiece = pieces.group
+        path = GetPiece(1)
+        line = GetPiece(2)
+        kind = GetPiece(3)
+        message = GetPiece(4)
+
         duplicate = lggg.makeLogRecord(record.__dict__)
         duplicate.msg = f"{kind}: {message}"
-        duplicate.module = module
-        duplicate.funcName = "<function>"
+        duplicate.pathname = path
+        duplicate.module = path_t(path).stem
+        duplicate.funcName = "?"
         duplicate.lineno = line
+
         interceptor.handle(duplicate)
 
     return handle_p

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.9"
+__version__ = "2024.11"

{logger_36-2024.9.dist-info → logger_36-2024.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: logger-36
-Version: 2024.9
+Version: 2024.11
 Summary: Simple logger with a catalog of handlers
 Home-page: https://src.koda.cnrs.fr/eric.debreuve/logger-36/
 Author: Eric Debreuve
@@ -60,7 +60,7 @@ Description-Content-Type: text/x-rst
 .. _DOCUMENTATION_URL: https://src.koda.cnrs.fr/eric.debreuve/logger-36/-/wikis/home
 
 .. |DEPENDENCIES_MANDATORY| replace:: None
-.. |DEPENDENCIES_OPTIONAL|  replace:: psutil, rich
+.. |DEPENDENCIES_OPTIONAL|  replace:: psutil, rich, tensorflow, tensorrt
 
 
 

{logger_36-2024.9.dist-info → logger_36-2024.11.dist-info}/RECORD

@@ -1,25 +1,26 @@
 logger_36/__init__.py,sha256=67ZAWtUx9Qy8Yn-tLQkOIEO6Z9U-8jhfm-tqNjjeFPU,1758
 logger_36/instance.py,sha256=wAVty29f24SCs4FRL600QySlA_WeLUM78p4t_Ni-LzA,1618
-logger_36/main.py,sha256=o1WOZoQurti7Uw1pkJXmlxTu4zk1SyQOVkmotL4I40Q,6692
-logger_36/version.py,sha256=w9erPu07Tga_bXnHyGgWBO3ct9W0EdR8tjDwlHuZJf0,1577
-logger_36/catalog/config/console_rich.py,sha256=sxxq6iPzlACCMUlDGhDIcDFWY3o6OR5rlg4uOwjsd30,2032
+logger_36/main.py,sha256=peXqcSDTrJhlKQkxSmum94BUJ8pIrtWTfvV9hUXp_pU,6558
+logger_36/version.py,sha256=VPjT_M7RlFPu1ODt109-IVr0VpM4GYTOMO2BBrkKt0A,1578
+logger_36/catalog/config/console_rich.py,sha256=XKRKJx_5dxp4mgan1D-u_qrQos-pezRccqKsnmn-ook,2119
 logger_36/catalog/handler/console.py,sha256=dm2-_1ZXUd6Gl1uyJaapPhUldzkEZ2fOlgeH8gxmpSs,3094
 logger_36/catalog/handler/console_rich.py,sha256=TMP9fupSY8OdGb3jeMAeSLjOssJBgcdwkTDo4Enud5U,6513
 logger_36/catalog/handler/file.py,sha256=tBShoy37F3riXDQc802feKzdpHQj5F3vqKaq211I1WI,3509
 logger_36/catalog/handler/generic.py,sha256=H0ky_4Ua0_xAXrjtAjVFvSteagdSu1WEXrPKcG4qbRY,6050
-logger_36/catalog/logging/chronos.py,sha256=1ZDeRllrYjzvbIt9vrGJhCdQ17Ywlbrn-nRnuM5vsSA,1816
-logger_36/catalog/logging/gpu.py,sha256=Or_F_8FWmAFmUhATyZ4gbWWP9YRSSaGEfWKGVAnPlMo,2467
+logger_36/catalog/logging/chronos.py,sha256=zVe5ZwB63mqNqlIDm6ZBi4-U5n_n-21h8umhimRUcdU,1815
+logger_36/catalog/logging/gpu.py,sha256=0XqVVK_TV1QPEwGXyK99jThHAjfsf-V__3m9Jh4gewk,2783
 logger_36/catalog/logging/memory.py,sha256=-5SOXAV43RnXznBPbClVMpMqtMlVtBsI46w6ngz1oP4,4040
 logger_36/catalog/logging/system.py,sha256=zomL8kRpmQuVP5KkcJkcUTnXK4ah3yn9PJb_cveNZDQ,2449
 logger_36/config/issue.py,sha256=wAOChQMpGECw-4Jy0TWArOeQ1P134cGyKaVbc6NrwX8,1639
 logger_36/config/memory.py,sha256=2OvnG7RMM1aZcUWBYGcNoBdLsQguo8cV862vCYSMbQs,1589
 logger_36/config/message.py,sha256=ZrR0jE144e88Dy_H5CXfmIAZnNsXH5P6i2VjCKaPU5w,2058
 logger_36/config/system.py,sha256=i39b-QNbg7i3BW_X-bHH9CqGO6mq1k9Ru5faYPi63SA,1849
+logger_36/constant/error.py,sha256=mqlzrSdOJkuMxtRQnhNXosiGEYp8KInODBJIIdCNgbE,2197
 logger_36/constant/generic.py,sha256=s0WHW-R_Eu2doDMoGERX3MtfCHmIW6uDjrDt_qP5MLA,1616
 logger_36/constant/handler.py,sha256=Iw4Pnr5ZUMIeRSA0netupu4icDWoMYKLZRW7_JWbwiI,1683
 logger_36/constant/issue.py,sha256=08BxREcVT0XnIFV3SrRQNd2uEOtnOP9VtscvRYXz1W4,1658
 logger_36/constant/logger.py,sha256=-dE218OMVyIgHIIEiXgJ0a4p_76CJk6ULihU0MvJO1g,2152
-logger_36/constant/memory.py,sha256=pSACyZ4bvB6AFtcN9tf_zU_Hcjjep5jh30HjDBxE79U,1797
+logger_36/constant/memory.py,sha256=gjQbcJt-bf6LluxPy40nY-UFJRQ7Z-zX1xi4BKTw9hI,1715
 logger_36/constant/message.py,sha256=tklw8IIT8f29lmmkk-se3GM9SKzRvmdIEJTX9ZQu-dc,2086
 logger_36/constant/record.py,sha256=oEwG4gjhN-Al_1cTjDLdvS_qYKUy4zkR5QUkYocT7eU,1683
 logger_36/constant/system.py,sha256=dlEU4q-hSFAO6aAa6m_yCGfBwNH5AHTyVZbRFTZ0U0U,1802
@@ -30,10 +31,10 @@ logger_36/task/format/message.py,sha256=91CCgH7umLHUV_YRf4AyOsYZTgNVOvQSODqXO1wJ
 logger_36/task/format/rule.py,sha256=cq4jl_ZCb8m7QoX8mWevXhy1hgwncLpc-9woKoT7m24,1970
 logger_36/task/measure/chronos.py,sha256=7xZskYEXQCPDypmnlhn4KDCBB1v3eL1OE_sv-l3n8Do,2255
 logger_36/task/measure/memory.py,sha256=aichGI-iCeE3Z4Y8AmWGdal2931IMdcdv4VgCeDLBoI,1876
-logger_36/type/extension.py,sha256=DBnCTaSqxiqXS79sFXgTf5WO-85ScCV9dbNzrVaWChY,5200
+logger_36/type/extension.py,sha256=W4sS48WiUUQStWq7rt8gZxtilElpfNSVc6cG3j8kfDA,5992
 logger_36/type/issue.py,sha256=OnkBKRTMsHvZ-2aLQWtBzGSWMTVs_4ermg71Ygcs0w8,2153
-logger_36/type/logger.py,sha256=eU5BhAETXpUTyY-2MoAOxsgmqaN537TgQkSnNABjoUg,12768
-logger_36-2024.9.dist-info/METADATA,sha256=78OmsaRDPKDQugG_x9-FGbEV0wRSc54NP53r0qo3tOc,5569
-logger_36-2024.9.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-logger_36-2024.9.dist-info/top_level.txt,sha256=sM95BTMWmslEEgR_1pzwZsOeSp8C_QBiu8ImbFr0XLc,10
-logger_36-2024.9.dist-info/RECORD,,
+logger_36/type/logger.py,sha256=FAaYj3wH9R9mhLNZLkYxjWwviWjDLBp4EilbHZnORJM,13248
+logger_36-2024.11.dist-info/METADATA,sha256=JBX4N-jAY_UNB4PpM9VrABAqQx1RA-ZfFyFfFos_T5k,5592
+logger_36-2024.11.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+logger_36-2024.11.dist-info/top_level.txt,sha256=sM95BTMWmslEEgR_1pzwZsOeSp8C_QBiu8ImbFr0XLc,10
+logger_36-2024.11.dist-info/RECORD,,