zstdlib 0.0.7__tar.gz → 0.0.9__tar.gz

{zstdlib-0.0.7 → zstdlib-0.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zstdlib
-Version: 0.0.7
+Version: 0.0.9
 Summary: A set of useful python utilities
 License: GPLv3
 Project-URL: Homepage, https://github.com/zwimer/zstdlib

{zstdlib-0.0.7 → zstdlib-0.0.9}/tests/log/test_cute.py

@@ -78,6 +78,28 @@ class TestCuteFormatter(LeftBase, unittest.TestCase):
         self.assertEqual(Color.bright_red_bg_yellow("CRITICAL".ljust(8)), l_name(5))
         self.assertEqual(Color.bright_red_bg_yellow("Level 60".ljust(8)), l_name(6))
 
+    def test_custom_dim_level(self) -> None:
+        name = "TestCuteFormatter.test_dim_level"
+        msg = "test"
+        with self.hijack(name, fmt=CuteFormatter(dim_level=5)) as log:
+            log.log(4, msg)
+            log.log(5, msg)
+        self.assertEqual(2, len(self.messages[log]))
+        l_name = lambda idx: self.messages[log][idx].split("|")[0].strip()
+        self.assertEqual(Color.dim("Level 4".ljust(8)), l_name(0))
+        self.assertEqual("Level 5", l_name(1))
+
+    def test_custom_level_color(self) -> None:
+        name = "TestCuteFormatter.test_custom_level_color"
+        msg = "test"
+        with self.hijack(name, fmt=CuteFormatter(level_colors={15: Color.bright_red_bg_yellow})) as log:
+            log.log(14, msg)
+            log.log(15, msg)
+        self.assertEqual(2, len(self.messages[log]))
+        l_name = lambda idx: self.messages[log][idx].split("|")[0].strip()
+        self.assertEqual("Level 14".ljust(8), l_name(0))
+        self.assertEqual(Color.bright_red_bg_yellow("Level 15".ljust(8)), l_name(1))
+
     def test_exception(self) -> None:
         name = "TestCuteFormatter.test_exception"
         with self.hijack(name, fmt=CuteFormatter()) as log:

{zstdlib-0.0.7 → zstdlib-0.0.9}/zstdlib/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.0.7"
+__version__ = "0.0.9"
 
 from .not_set import NotSetType, NotSet
 from .frozen import Freezable, frozen

{zstdlib-0.0.7 → zstdlib-0.0.9}/zstdlib/ansi.py

@@ -107,6 +107,12 @@ class Color(metaclass=_ColorMeta):
             raise TypeError("Cannot add non-Color to Color")
         return type(self)(code=f"{self.code[:-1]};{other.code[len(_PREFIX):]}")
 
+    def __eq__(self, other: object) -> bool:
+        """
+        :return: Whether the two colors are equal
+        """
+        return isinstance(other, type(self)) and self.code == other.code
+
     def __repr__(self) -> str:
         """
         :return: The ansi color code this object represents

{zstdlib-0.0.7 → zstdlib-0.0.9}/zstdlib/log/cute.py

@@ -16,17 +16,25 @@ class CuteFormatter(Formatter):
     A log formatter that can print log messages with colors.
     """
 
-    DEFAULT_CUTE_WIDTHS = {"cute_levelname": 8, "cute_time": 23, "cute_name": 12}
-    __slots__ = ("colored", "_color", "_cmap", "_name_width")
+    __slots__ = ("colored", "_color", "_cmap", "_lvl_cmap", "_dim_level", "_name_width")
+    DEFAULT_CUTE_WIDTHS: dict[str, int] = {"cute_levelname": 8, "cute_time": 23, "cute_name": 12}
+    DEFAULT_LEVEL_COLORS: dict[int, Color] = {
+        INFO: Color.blue,
+        WARNING: Color.yellow,
+        ERROR: Color.red,
+        CRITICAL: Color.bright_red_bg_yellow,
+    }
 
-    # pylint: disable=dangerous-default-value
+    # pylint: disable=dangerous-default-value,keyword-arg-before-vararg,too-many-arguments
     def __init__(
         self,
-        colors: dict[str, Color] | None = None,
-        *,
+        fmt="%(cute_levelname)s | %(cute_asctime)s | %(cute_name)s | %(cute_message)s",
+        *args,
         colored: bool = True,
+        dim_level: int = DEBUG,
+        colors: dict[str, Color] = {},
+        level_colors: dict[int, Color] = {},
         cute_widths: dict[str, int] = {},
-        fmt="%(cute_levelname)s | %(cute_asctime)s | %(cute_name)s | %(cute_message)s",
         **kwargs,
     ):
         """
@@ -34,16 +42,20 @@ class CuteFormatter(Formatter):
         Do not modify cute_ parameters in the fmt string; they might have special formatting that is not visible
         Ex. %(cute_name)-8s should be done via cute_widths["cute_name"] = 8
         This is because cute_widths takes into account 0-width color codes when padding
-        :param colors: The colors to use for the given loggers, automatic for non-specified loggers
-        :param colored: If False, no colors will be used regardless of the colors parameter
+        Level colors used are: DEFAULT_LEVEL_COLORS | level_colors
+        Dimming of log messages is done for levels < dim_level
         :param fmt: The format string to use for the log message; do not modify cute_ parameters
+        :param args: Passed to logging.Formatter
+        :param colored: If False, no colors will be used regardless of the colors parameter
+        :param colors: The colors to use for the given loggers, automatic for non-specified loggers
+        :param level_colors: The colors to use >= the given levels, automatic for non-specified loggers
         :param cute_widths: The widths of the cute_ columns in the log message
         :param kwargs: Passed to logging.Formatter
         """
-        super().__init__(fmt=fmt, **kwargs)
-        self._cmap: dict[str, Color] = {}
-        if colors is not None:
-            self.update(colors)
+        super().__init__(fmt, *args, **kwargs)
+        self._dim_level: int = dim_level
+        self._cmap: dict[str, Color] = dict(colors)
+        self._lvl_cmap: dict[int, Color] = self.DEFAULT_LEVEL_COLORS | level_colors
         self._widths = defaultdict(int, self.DEFAULT_CUTE_WIDTHS | cute_widths)
         if any(not i.startswith("cute_") for i in self._widths):
             raise ValueError("cute_widths must only contain cute_ parameters")
@@ -53,7 +65,7 @@ class CuteFormatter(Formatter):
         """
         Set the colors for all loggers; enables colors if disabled
         """
-        self._cmap.update(colors)
+        self._cmap |= colors
 
     def format(self, record: LogRecord) -> str:
         levelname: str = record.levelname.ljust(self._widths["cute_levelname"])
@@ -62,26 +74,22 @@ class CuteFormatter(Formatter):
         message: str = record.getMessage().ljust(self._widths["cute_message"])
         if self.colored:
             # Color level
-            if record.levelno >= CRITICAL:
-                levelname = Color.bright_red_bg_yellow(levelname)
-            elif record.levelno >= ERROR:
-                levelname = Color.red(levelname)
-            elif record.levelno >= WARNING:
-                levelname = Color.yellow(levelname)
-            elif record.levelno >= INFO:
-                levelname = Color.blue(levelname)
-            elif record.levelno < DEBUG:
-                levelname = Color.dim(levelname)
+            opts = tuple(i for i in self._lvl_cmap if i <= record.levelno)
+            col: Color | None = self._lvl_cmap[max(opts)] if opts else None
+            if record.levelno < self._dim_level:
+                col = Color.dim if col is None else (col + Color.dim)
+            if col is not None:
+                levelname = col(levelname)
             # Color text
             if (col := self._cmap.get(record.name, None)) is None:
                 c: int = adler32(record.name.encode()) % 7
                 col = Color(RawColor(PureColor.black.value + c)) if c != 0 else Color.default
-            if record.levelno < DEBUG:
+            if record.levelno < self._dim_level:
                 col += Color.dim
             message = col(message)
             name = col(name)
             # Color timestamp
-            if record.levelno < DEBUG:
+            if record.levelno < self._dim_level:
                 asctime = Color.dim(asctime)
         # Create an updated record then format that
         new = copy(record)

{zstdlib-0.0.7 → zstdlib-0.0.9}/zstdlib.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zstdlib
-Version: 0.0.7
+Version: 0.0.9
 Summary: A set of useful python utilities
 License: GPLv3
 Project-URL: Homepage, https://github.com/zwimer/zstdlib