dycw-utilities 0.114.4__tar.gz → 0.114.5__tar.gz

{dycw_utilities-0.114.4 → dycw_utilities-0.114.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dycw-utilities
-Version: 0.114.4
+Version: 0.114.5
 Author-email: Derek Wan <d.wan@icloud.com>
 License-File: LICENSE
 Requires-Python: >=3.12

{dycw_utilities-0.114.4 → dycw_utilities-0.114.5}/pyproject.toml

@@ -92,7 +92,7 @@ dependencies = [
 name = "dycw-utilities"
 readme = "README.md"
 requires-python = ">= 3.12"
-version = "0.114.4"
+version = "0.114.5"
 
 [project.optional-dependencies]
 test = [
@@ -334,7 +334,7 @@ zzz-test-zoneinfo = [
 # bump-my-version
 [tool.bumpversion]
 allow_dirty = true
-current_version = "0.114.4"
+current_version = "0.114.5"
 
 [[tool.bumpversion.files]]
 filename = "src/utilities/__init__.py"

{dycw_utilities-0.114.4 → dycw_utilities-0.114.5}/src/utilities/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.114.4"
+__version__ = "0.114.5"

{dycw_utilities-0.114.4 → dycw_utilities-0.114.5}/src/utilities/logging.py

@@ -587,19 +587,19 @@ def setup_logging(
 
     # console
     if console_level is not None:  # skipif-ci-and-windows
-        console_low_handler = StreamHandler(stream=stdout)
-        add_filters(console_low_handler, lambda x: x.levelno < ERROR)
-        add_filters(console_low_handler, *console_filters)
-        add_filters(console_low_handler, *filters)
-        console_low_handler.setFormatter(console_formatter)
-        console_low_handler.setLevel(console_level)
-        logger_use.addHandler(console_low_handler)
-
-        console_high_handler = StreamHandler(stream=stdout)
-        add_filters(console_high_handler, *console_filters)
-        add_filters(console_high_handler, *filters)
+        console_low_or_no_exc_handler = StreamHandler(stream=stdout)
+        add_filters(console_low_or_no_exc_handler, _console_low_or_no_exc_filter)
+        add_filters(console_low_or_no_exc_handler, *console_filters)
+        add_filters(console_low_or_no_exc_handler, *filters)
+        console_low_or_no_exc_handler.setFormatter(console_formatter)
+        console_low_or_no_exc_handler.setLevel(console_level)
+        logger_use.addHandler(console_low_or_no_exc_handler)
+
+        console_high_and_exc_handler = StreamHandler(stream=stdout)
+        add_filters(console_high_and_exc_handler, *console_filters)
+        add_filters(console_high_and_exc_handler, *filters)
         _ = RichTracebackFormatter.create_and_set(
-            console_high_handler,
+            console_high_and_exc_handler,
             version=formatter_version,
             max_width=formatter_max_width,
             indent_size=formatter_indent_size,
@@ -610,10 +610,10 @@ def setup_logging(
             detail=True,
             post=_ansi_wrap_red,
         )
-        console_high_handler.setLevel(
+        console_high_and_exc_handler.setLevel(
             max(get_logging_level_number(console_level), ERROR)
         )
-        logger_use.addHandler(console_high_handler)
+        logger_use.addHandler(console_high_and_exc_handler)
 
     # debug & info
     directory = resolve_path(path=files_dir)  # skipif-ci-and-windows
@@ -640,7 +640,7 @@ def setup_logging(
     standalone_file_handler = StandaloneFileHandler(  # skipif-ci-and-windows
         level=ERROR, path=directory.joinpath("errors")
     )
-    add_filters(standalone_file_handler, lambda x: x.exc_info is not None)
+    add_filters(standalone_file_handler, _standalone_file_filter)
     standalone_file_handler.setFormatter(
         RichTracebackFormatter(
             version=formatter_version,
@@ -660,6 +660,16 @@ def setup_logging(
         extra(logger_use)
 
 
+def _console_low_or_no_exc_filter(record: LogRecord, /) -> bool:
+    return (record.levelno < ERROR) or (
+        (record.levelno >= ERROR) and (record.exc_info is None)
+    )
+
+
+def _standalone_file_filter(record: LogRecord, /) -> bool:
+    return record.exc_info is not None
+
+
 ##
 
 

{dycw_utilities-0.114.4 → dycw_utilities-0.114.5}/src/utilities/traceback.py

@@ -60,6 +60,9 @@ _CALL_ARGS = "_CALL_ARGS"
 _INDENT = 4 * " "
 
 
+##
+
+
 class RichTracebackFormatter(Formatter):
     """Formatter for rich tracebacks."""
 
@@ -162,10 +165,17 @@ class RichTracebackFormatter(Formatter):
             detail=detail,
             post=post,
         )
-        handler.addFilter(lambda r: r.exc_info is not None)
+        handler.addFilter(cls._has_exc_info)
         handler.setFormatter(formatter)
         return formatter
 
+    @classmethod
+    def _has_exc_info(cls, record: LogRecord, /) -> bool:
+        return record.exc_info is not None
+
+
+##
+
 
 @dataclass(repr=False, kw_only=True, slots=True)
 class _CallArgs:
@@ -470,6 +480,9 @@ class _Frame:
         return indent("\n".join(lines), depth * _INDENT)
 
 
+##
+
+
 def get_rich_traceback(
     error: TBaseException,
     /,