chromatic-python 0.3.2__tar.gz → 0.3.3__tar.gz

{chromatic_python-0.3.2/chromatic_python.egg-info → chromatic_python-0.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chromatic-python
-Version: 0.3.2
+Version: 0.3.3
 Summary: ANSI art image processing and colored terminal text
 Author: crypt0lith
 Project-URL: Homepage, https://github.com/crypt0lith/chromatic

{chromatic_python-0.3.2 → chromatic_python-0.3.3}/chromatic/__init__.pyi

@@ -7,6 +7,7 @@ __all__ = [
     'Fore',
     'SgrParameter',
     'Style',
+    'UserFont',
     '__version__',
     'ansi2img',
     'ansi_quantize',
@@ -14,10 +15,10 @@ __all__ = [
     'ansicolor4Bit',
     'ansicolor8Bit',
     'ansify',
-    'image',
     'ascii2img',
     'ascii_printable',
     'color',
+    'color_chain',
     'colorbytes',
     'contrast_stretch',
     'cp437_printable',
@@ -26,14 +27,23 @@ __all__ = [
     'get_font_key',
     'get_font_object',
     'get_glyph_masks',
+    'hexstr2rgb',
+    'image',
     'img2ansi',
     'img2ascii',
+    'int2rgb',
     'named_color',
     'read_ans',
     'register_userfont',
     'render_ans',
     'reshape_ansi',
+    'rgb2hexstr',
+    'rgb2int',
+    'sort_glyphs',
     'to_sgr_array',
+    'ttf_extract_codepoints',
+    'userfont',
+    'set_default_ansi',
 ]
 from . import color, data, image
 from ._version import version as __version__
@@ -48,10 +58,16 @@ from .color import (
     ansicolor24Bit,
     ansicolor4Bit,
     ansicolor8Bit,
+    color_chain,
     colorbytes,
+    hexstr2rgb,
+    int2rgb,
     named_color,
+    rgb2hexstr,
+    rgb2int,
+    set_default_ansi,
 )
-from .data import register_userfont
+from .data import UserFont, register_userfont, userfont
 from .image import (
     AnsiImage,
     ansi2img,
@@ -71,4 +87,4 @@ from .image import (
     reshape_ansi,
     to_sgr_array,
 )
-from .image._glyph_proc import get_glyph_masks
+from .image._glyph_proc import get_glyph_masks, sort_glyphs, ttf_extract_codepoints

chromatic_python-0.3.3/chromatic/_version.py

@@ -0,0 +1,34 @@
+# file generated by setuptools-scm
+# don't change, don't track in version control
+
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
+
+TYPE_CHECKING = False
+if TYPE_CHECKING:
+    from typing import Tuple
+    from typing import Union
+
+    VERSION_TUPLE = Tuple[Union[int, str], ...]
+    COMMIT_ID = Union[str, None]
+else:
+    VERSION_TUPLE = object
+    COMMIT_ID = object
+
+version: str
+__version__: str
+__version_tuple__: VERSION_TUPLE
+version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
+
+__version__ = version = '0.3.3'
+__version_tuple__ = version_tuple = (0, 3, 3)
+
+__commit_id__ = commit_id = 'g23243f5d4'

{chromatic_python-0.3.2 → chromatic_python-0.3.3}/chromatic/color/__init__.pyi

@@ -5,6 +5,7 @@ __all__ = [
     'Color',
     'ColorNamespace',
     'ColorStr',
+    'DEFAULT_ANSI',
     'Fore',
     'SGR_RESET',
     'SgrParameter',
@@ -18,10 +19,10 @@ __all__ = [
     'color_chain',
     'colorbytes',
     'get_ansi_type',
-    'int2rgb',
     'hexstr2rgb',
     'hsl2rgb',
     'hsv2rgb',
+    'int2rgb',
     'is_u24',
     'lab2rgb',
     'lab2xyz',
@@ -30,15 +31,16 @@ __all__ = [
     'nearest_ansi_8bit_rgb',
     'randcolor',
     'rgb2ansi_escape',
-    'rgb2int',
     'rgb2hexstr',
     'rgb2hsl',
     'rgb2hsv',
+    'rgb2int',
     'rgb2lab',
     'rgb2xyz',
     'rgb_diff',
     'rgb_dispatch',
     'rgb_to_ansi_8bit',
+    'set_default_ansi',
     'xyz2lab',
     'xyz2rgb',
 ]
@@ -47,19 +49,19 @@ from .colorconv import (
     ANSI_4BIT_RGB,
     ansi_4bit_to_rgb,
     ansi_8bit_to_rgb,
-    int2rgb,
     hexstr2rgb,
     hsl2rgb,
     hsv2rgb,
+    int2rgb,
     is_u24,
     lab2rgb,
     lab2xyz,
     nearest_ansi_4bit_rgb,
     nearest_ansi_8bit_rgb,
-    rgb2int,
     rgb2hexstr,
     rgb2hsl,
     rgb2hsv,
+    rgb2int,
     rgb2lab,
     rgb2xyz,
     rgb_diff,
@@ -71,6 +73,7 @@ from .core import (
     CSI,
     Color,
     ColorStr,
+    DEFAULT_ANSI,
     SGR_RESET,
     SgrParameter,
     SgrSequence,
@@ -82,5 +85,6 @@ from .core import (
     get_ansi_type,
     randcolor,
     rgb2ansi_escape,
+    set_default_ansi,
 )
 from .palette import Back, ColorNamespace, Fore, Style, named_color, rgb_dispatch

{chromatic_python-0.3.2 → chromatic_python-0.3.3}/chromatic/color/core.py

@@ -266,8 +266,6 @@ class colorbytes(bytes):
 class ansicolor4Bit(colorbytes):
     """ANSI 4-bit color format.
 
-    alias: '4b'
-
     Supports 16 colors:
         * 8 standard colors:
             {0: black, 1: red, 2: green, 3: yellow, 4: blue, 5: magenta, 6: cyan, 7: white}
@@ -298,8 +296,6 @@ class ansicolor4Bit(colorbytes):
 class ansicolor8Bit(colorbytes):
     """ANSI 8-Bit color format.
 
-    alias: '8b'
-
     Supports 256 colors, mapped to the following value ranges:
         * (0, 15): Corresponds to ANSI 4-bit colors.
         * (16, 231): Represents a 6x6x6 RGB color cube.
@@ -328,8 +324,6 @@ class ansicolor8Bit(colorbytes):
 class ansicolor24Bit(colorbytes):
     """ANSI 24-Bit color format.
 
-    alias: '24b'
-
     Supports all colors in the RGB color space (16,777,216 total).
 
     Color codes use escape sequences of the form:
@@ -407,7 +401,37 @@ def _is_ansi_type(typ: type):
         return False
 
 
-@lru_cache(maxsize=None)
+@lru_cache
+def get_ansi_type(typ):
+    try:
+        return _ANSI_FORMAT_MAP[typ]
+    except (TypeError, KeyError) as e:
+        if isinstance(typ, str):
+            err = ValueError(f"invalid ANSI color format alias: {e!r}")
+        else:
+            from .._typing import unionize
+
+            repr_getter = lambda t: (t if isinstance(t, type) else type(t))
+            msg = (
+                "Expected {.__name__!r} or {}, got {.__name__!r} object instead".format(
+                    str,
+                    type[unionize(set(map(repr_getter, _ANSI_FORMAT_MAP.values())))],
+                    repr_getter(typ),
+                )
+            )
+            err = TypeError(msg)
+        err.__cause__ = e.__cause__
+        raise err
+
+
+def set_default_ansi(typ):
+    """Sets the global `DEFAULT_ANSI` variable to the specified ANSI color format"""
+    if valid_typ := get_ansi_type(typ):
+        global DEFAULT_ANSI
+        DEFAULT_ANSI = valid_typ
+
+
+@lru_cache(maxsize=1)
 def sgr_re_pattern():
     uint8_re = r"(?:25[0-5]|2[0-4]\d|1\d{2}|[1-9]\d|\d)"
     ansicolor_re = f"[3-4]8;(?:2(?:;{uint8_re}){{3}}|5;{uint8_re})"
@@ -456,29 +480,6 @@ def _concat_ansi_escape(__it: Iterable[bytes | bytearray]):
     return b'\x1b[%sm' % b';'.join(__it)
 
 
-@lru_cache
-def get_ansi_type(typ):
-    try:
-        return _ANSI_FORMAT_MAP[typ]
-    except (TypeError, KeyError) as e:
-        if isinstance(typ, str):
-            err = ValueError(f"invalid ANSI color format alias: {e!r}")
-        else:
-            from .._typing import unionize
-
-            repr_getter = lambda t: (t if isinstance(t, type) else type(t))
-            msg = (
-                "Expected {.__name__!r} or {}, got {.__name__!r} object instead".format(
-                    str,
-                    type[unionize(set(map(repr_getter, _ANSI_FORMAT_MAP.values())))],
-                    repr_getter(typ),
-                )
-            )
-            err = TypeError(msg)
-        err.__cause__ = e.__cause__
-        raise err
-
-
 def rgb2ansi_escape(fmt, mode, rgb):
     fmt = get_ansi_type(fmt)
     if len(rgb) != 3:

{chromatic_python-0.3.2 → chromatic_python-0.3.3}/chromatic/color/core.pyi

@@ -54,6 +54,7 @@ from chromatic._typing import (
     TupleOf3,
 )
 
+
 @overload
 def get_ansi_type[_T: AnsiColorType](typ: _T) -> _T: ...
 @overload
@@ -62,6 +63,7 @@ def get_ansi_type(typ: Ansi4BitAlias) -> type[ansicolor4Bit]: ...
 def get_ansi_type(typ: Ansi8BitAlias) -> type[ansicolor8Bit]: ...
 @overload
 def get_ansi_type(typ: Ansi24BitAlias) -> type[ansicolor24Bit]: ...
+def set_default_ansi(typ: AnsiColorAlias | AnsiColorType): ...
 def randcolor() -> Color: ...
 def rgb2ansi_escape(
     fmt: AnsiColorAlias | AnsiColorType, mode: ColorDictKeys, rgb: Int3Tuple

{chromatic_python-0.3.2 → chromatic_python-0.3.3}/chromatic/demo.py

@@ -172,6 +172,26 @@ def named_colors():
         print(' | '.join(line))
 
 
+@DEMO_FUNCS.register
+def color_cube():
+    """Print the ANSI256 6x6x6 color cube"""
+    fmt_code = lambda n: f"\x1b[48;5;{n}m{n: >4}"
+    for i in range(0, 8, 4):
+        for j in range(i, i + 8):
+            print(fmt_code(i + j), end='')
+        else:
+            print("\x1b[m")
+    for i in range(6):
+        for j in range(0x10, 0xE8, 6):
+            print(fmt_code(i + j), end='')
+        else:
+            print("\x1b[m")
+    for i in range(0xE8, 0x100):
+        print(fmt_code(i), end='')
+    else:
+        print("\x1b[m")
+
+
 @DEMO_FUNCS.register
 def color_table():
     """Print foreground / background combinations in each ANSI format.

{chromatic_python-0.3.2 → chromatic_python-0.3.3}/chromatic/image/_array.py

@@ -85,6 +85,7 @@ if TYPE_CHECKING:
         RGBImageLike,
         ShapedNDArray,
         TupleOf2,
+        TupleOf3,
     )
 
     LiteralDigit: TypeAlias = Sequence[
@@ -507,8 +508,8 @@ def img2ascii(
 
 def img2ascii(
     __img: RGBImageLike | PathLike[str] | str,
-    __font: FontArgType = 'arial.ttf',
-    factor: int = 100,
+    __font: FontArgType = userfont['vga437'],
+    factor: int = 200,
     char_set: Iterable[str] = None,
     sort_glyphs: bool | type[reversed] = True,
     *,
@@ -585,8 +586,8 @@ def img2ascii(
 @rgb_dispatch(('bg',))
 def img2ansi(
     __img: RGBImageLike | PathLike[str] | str,
-    __font: FontArgType = 'arial.ttf',
-    factor: int = 100,
+    __font: FontArgType = userfont['vga437'],
+    factor: int = 200,
     char_set: Iterable[str] = None,
     ansi_type: AnsiColorParam = DEFAULT_ANSI,
     sort_glyphs: bool | type[reversed] = True,
@@ -671,7 +672,7 @@ def img2ansi(
         x = []
         for j in range(w):
             char = lines[i][j]
-            fg_color = Color.from_rgb(color_arr.getpixel([j, i]))
+            fg_color = Color.from_rgb(color_arr.getpixel((j, i)))
             if j > 0 and x[-1].fg == fg_color:
                 x[-1] += char
             else:
@@ -683,8 +684,8 @@ def img2ansi(
 @rgb_dispatch(('fg', 'bg'))
 def ascii2img(
     __ascii: str,
-    __font: FontArgType = 'arial.ttf',
-    font_size=24,
+    __font: FontArgType = userfont['vga437'],
+    font_size=16,
     *,
     fg: Int3Tuple | str = (0, 0, 0),
     bg: Int3Tuple | str = (0xFF, 0xFF, 0xFF),
@@ -722,7 +723,8 @@ def ascii2img(
     n_rows, n_cols = map(len, (lines, lines[0]))
     cw, ch = _get_bbox_shape(font)
     iw, ih = (int(i * j) for i, j in zip((cw, ch), (n_cols, n_rows)))
-    img = Image.new('RGB', (iw, ih), tuple(map(int, bg)))
+    (r, g, b) = tuple(map(int, bg))
+    img = Image.new('RGB', (iw, ih), (r, g, b))
     draw = ImageDraw.Draw(img)
     y_offset = 0
     for line in lines:
@@ -734,8 +736,8 @@ def ascii2img(
 @rgb_dispatch(('fg_default', 'bg_default'))
 def ansi2img(
     __ansi_array: list[list[ColorStr]],
-    __font: FontArgType = 'arial.ttf',
-    font_size=24,
+    __font: FontArgType = userfont['vga437'],
+    font_size=16,
     *,
     fg_default: Int3Tuple | str = (170, 170, 170),
     bg_default: Int3Tuple | str | Literal['auto'] = 'auto',
@@ -782,12 +784,13 @@ def ansi2img(
         for row in __ansi_array
     )
     iw, ih = map(int, (max_row_width, n_rows * row_height))
-    input_fg = fg_default
+    input_fg: TupleOf3[int] = fg_default
     if auto := bg_default == 'auto':
         input_bg = bg_default = None
     else:
         input_bg = bg_default
-    img = Image.new('RGB', (iw, ih), cast(tuple[float, ...], bg_default))
+    bg_default: Optional[TupleOf3[int] | ...]
+    img = Image.new('RGB', (iw, ih), bg_default)
     draw = ImageDraw.Draw(img)
     y_offset = 0
     for row in __ansi_array:
@@ -803,7 +806,7 @@ def ansi2img(
                 if auto:
                     bg_default = bg_color
             draw.rectangle(
-                [x_offset, y_offset, x_offset + text_width, y_offset + row_height],
+                (x_offset, y_offset, x_offset + text_width, y_offset + row_height),
                 fill=bg_color or (0, 0, 0),
             )
             draw.text(
@@ -882,7 +885,7 @@ def _is_csi_param(__c: str) -> TypeGuard[Literal[';'] | LiteralDigit]:
     return __c == ';' or __c.isdigit()
 
 
-@lru_cache(maxsize=None)
+@lru_cache(maxsize=1)
 def sgr_span_re_pattern():
     sgr_re = sgr_re_pattern().pattern.removeprefix(r'\x1b\[')
     return re.compile(
@@ -952,7 +955,6 @@ def _sub_bold_colors(lines: Iterable[str]) -> Iterator[str]:
 
 
 def reshape_ansi(__str: str, w: int, h: int) -> str:
-
     def cursor() -> Generator[tuple[int, int], tuple[int, int], None]:
         idx, total = 0, h * w
         while idx < total:
@@ -1026,8 +1028,8 @@ def reshape_ansi(__str: str, w: int, h: int) -> str:
 
 
 @lru_cache
-def to_sgr_array(__str: str, ansi_type: AnsiColorParam = DEFAULT_ANSI):
-    ansi_typ = get_ansi_type(ansi_type)
+def to_sgr_array(__str: str, ansi_type: AnsiColorParam = None):
+    ansi_typ = DEFAULT_ANSI if ansi_type is None else get_ansi_type(ansi_type)
     new_cs = partial(ColorStr, ansi_type=ansi_typ, reset=False)
     xs = []
     for line in _sub_bold_colors(__str.splitlines()):

{chromatic_python-0.3.2 → chromatic_python-0.3.3}/chromatic/image/_glyph_proc.py

@@ -63,17 +63,19 @@ def get_glyph_masks(
 
 
 def sort_glyphs(__s: str, font: FontArgType, reverse: bool = False):
-    def _sum_mask(item: tuple[str, np.ndarray]):
-        return item[0], np.sum(item[1])
-
+    all_chars = list(__s)
+    mapping = {}
+    for c, arr in get_glyph_masks(font, __s, dist_transform=True).items():
+        v = np.sum(arr)
+        if v <= 0 and c != ' ':
+            continue
+        mapping[c] = v
     return ''.join(
-        char
-        for (char, value) in sorted(
-            map(_sum_mask, get_glyph_masks(font, __s, dist_transform=True).items()),
-            key=lambda x: x[1],
+        sorted(
+            filter(mapping.__contains__, all_chars),
+            key=mapping.__getitem__,
             reverse=reverse,
         )
-        if value > 0 or char == ' '
     )
 
 
@@ -84,7 +86,5 @@ def ttf_extract_codepoints(
     with TTFont(__fp, **kwargs) as font:
         for table in font['cmap'].tables:
             codepoints |= table.cmap.keys()
-
-    return np.sort(
-        np.array([i for i in codepoints if chr(i).isprintable()], dtype='<u2')
-    )
+    arr = np.array([i for i in codepoints if chr(i).isprintable()], dtype='<u2')
+    return np.sort(arr)  # type: ignore[arg-type]

{chromatic_python-0.3.2 → chromatic_python-0.3.3/chromatic_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chromatic-python
-Version: 0.3.2
+Version: 0.3.3
 Summary: ANSI art image processing and colored terminal text
 Author: crypt0lith
 Project-URL: Homepage, https://github.com/crypt0lith/chromatic

{chromatic_python-0.3.2 → chromatic_python-0.3.3}/pyproject.toml

@@ -20,6 +20,7 @@ dependencies = [
 authors = [{ name = "crypt0lith" }]
 description = "ANSI art image processing and colored terminal text"
 readme = "README.md"
+license-files = ["LICENSE"]
 keywords = ["ansi", "ascii", "art", "font", "image", "terminal", "parser"]
 classifiers = [
     "Programming Language :: Python :: 3.12",
@@ -31,9 +32,6 @@ classifiers = [
 [project.urls]
 Homepage = "https://github.com/crypt0lith/chromatic"
 
-[tool.setuptools]
-license-files = ["LICENSE"]
-
 [tool.setuptools_scm]
 write_to = "chromatic/_version.py"
 

{chromatic_python-0.3.2 → chromatic_python-0.3.3}/tests/test_color_str.py

@@ -178,10 +178,10 @@ def _rand_color_str_array(n_rows=10, n_cols=10):
                     (
                         current,
                         *(
-                            (
-                                (c.as_ansi_type(t) if isinstance(c, ColorStr) else c)
+                            [
+                                c.as_ansi_type(t) if isinstance(c, ColorStr) else c
                                 for c in current
-                            )
+                            ]
                             for t in (ansicolor4Bit, ansicolor8Bit, ansicolor24Bit)
                         ),
                     ),

chromatic_python-0.3.2/chromatic/_version.py

@@ -1,21 +0,0 @@
-# file generated by setuptools-scm
-# don't change, don't track in version control
-
-__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
-
-TYPE_CHECKING = False
-if TYPE_CHECKING:
-    from typing import Tuple
-    from typing import Union
-
-    VERSION_TUPLE = Tuple[Union[int, str], ...]
-else:
-    VERSION_TUPLE = object
-
-version: str
-__version__: str
-__version_tuple__: VERSION_TUPLE
-version_tuple: VERSION_TUPLE
-
-__version__ = version = '0.3.2'
-__version_tuple__ = version_tuple = (0, 3, 2)