zstdlib 0.0.6__tar.gz → 0.0.7__tar.gz

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

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

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

@@ -17,16 +17,25 @@ class TestCuteFormatter(LeftBase, unittest.TestCase):
         msg = self.messages[log][0].rsplit("|", 1)[-1]
         self.assertEqual(f" {color.code}test{Color.RESET}", msg)
 
-    def test_name_width(self) -> None:
-        width = 123
+    def test_width(self) -> None:
         color = Color.red
-        name = "TestCuteFormatter.name_width"
-        with self.hijack(name, fmt=CuteFormatter(colors={name: color}, name_width=width)) as log:
+        name = "TestCuteFormatter.test_width"
+        cw = {
+            "cute_levelname": 300,
+            "cute_asctime": 200,
+            "cute_name": 100,
+            "cute_message": 400,
+        }
+        fmt = CuteFormatter(fmt="|".join(f"%({i})s" for i in cw), colors={name: color}, cute_widths=cw)
+        with self.hijack(name, fmt=fmt) as log:
             log.debug("test")
-        lvl, _, nam, msg = self.messages[log][0].split("|")
-        self.assertEqual("DEBUG", lvl.strip())
-        self.assertEqual(f" {color(name.ljust(width))} ", nam)
-        self.assertEqual(f" {color('test')}", msg)
+        lvl, date, nam, msg = self.messages[log][0].split("|")
+        self.assertEqual("DEBUG".ljust(cw["cute_levelname"]), lvl)
+        self.assertEqual(cw["cute_asctime"], len(date))
+        self.assertEqual(f"{color(name.ljust(cw['cute_name']))}", nam)
+        self.assertEqual(f"{color('test'.ljust(cw['cute_message']))}", msg)
+        with self.assertRaises(ValueError):
+            CuteFormatter(cute_widths={"name": 123})
 
     def test_no_color(self) -> None:
         name = "TestCuteFormatter.test_no_color"

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

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

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

@@ -1,6 +1,6 @@
 from __future__ import annotations
 from logging import CRITICAL, ERROR, WARNING, INFO, DEBUG, Formatter
-from traceback import format_exception
+from collections import defaultdict
 from typing import TYPE_CHECKING
 from zlib import adler32
 from copy import copy
@@ -16,32 +16,37 @@ 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")
 
+    # pylint: disable=dangerous-default-value
     def __init__(
         self,
         colors: dict[str, Color] | None = None,
         *,
         colored: bool = True,
-        name_width: int = 12,
-        fmt="%(cute_levelname)s | %(cute_time)s | %(cute_name)s | %(cute_message)s%(cute_exc)s",
+        cute_widths: dict[str, int] = {},
+        fmt="%(cute_levelname)s | %(cute_asctime)s | %(cute_name)s | %(cute_message)s",
         **kwargs,
     ):
         """
         log_colors may be overridden, for example, trace logs are printed dimly
         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 name_width, that takes into account 0-width color codes
+        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
         :param fmt: The format string to use for the log message; do not modify cute_ parameters
-        :param name_width: How wide the column containing the logger name should be (minus padding)
+        :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)
-        self._name_width = name_width
+        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")
         self.colored: bool = colored
 
     def update(self, colors: dict[str, Color]):
@@ -51,22 +56,22 @@ class CuteFormatter(Formatter):
         self._cmap.update(colors)
 
     def format(self, record: LogRecord) -> str:
-        level: str = record.levelname.ljust(8)
-        when = self.formatTime(record, self.datefmt).ljust(23)
-        name: str = record.name.ljust(self._name_width)
-        message: str = record.getMessage()
+        levelname: str = record.levelname.ljust(self._widths["cute_levelname"])
+        asctime = self.formatTime(record, self.datefmt).ljust(self._widths["cute_asctime"])
+        name: str = record.name.ljust(self._widths["cute_name"])
+        message: str = record.getMessage().ljust(self._widths["cute_message"])
         if self.colored:
             # Color level
             if record.levelno >= CRITICAL:
-                level = Color.bright_red_bg_yellow(level)
+                levelname = Color.bright_red_bg_yellow(levelname)
             elif record.levelno >= ERROR:
-                level = Color.red(level)
+                levelname = Color.red(levelname)
             elif record.levelno >= WARNING:
-                level = Color.yellow(level)
+                levelname = Color.yellow(levelname)
             elif record.levelno >= INFO:
-                level = Color.blue(level)
+                levelname = Color.blue(levelname)
             elif record.levelno < DEBUG:
-                level = Color.dim(level)
+                levelname = Color.dim(levelname)
             # Color text
             if (col := self._cmap.get(record.name, None)) is None:
                 c: int = adler32(record.name.encode()) % 7
@@ -77,16 +82,15 @@ class CuteFormatter(Formatter):
             name = col(name)
             # Color timestamp
             if record.levelno < DEBUG:
-                when = Color.dim(when)
+                asctime = Color.dim(asctime)
         # Create an updated record then format that
         new = copy(record)
         new.__dict__.update(
             {
-                "cute_levelname": level,
-                "cute_time": when,
+                "cute_levelname": levelname,
+                "cute_asctime": asctime,
                 "cute_name": name,
                 "cute_message": message,
-                "cute_exc": ("\n" + "".join(format_exception(*new.exc_info))[:-1]) if new.exc_info else "",
             }
         )
         return super().format(new)

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

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