chromatic-python 0.7.2__tar.gz → 0.7.3__tar.gz

chromatic_python-0.7.3/.github/workflows/docs.yml

@@ -0,0 +1,36 @@
+name: docs
+
+on:
+  release:
+    types: [released]
+  workflow_dispatch:
+
+permissions:
+  pages: write
+  id-token: write
+
+concurrency:
+  group: pages
+  cancel-in-progress: false
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: astral-sh/setup-uv@v5
+      - run: uv sync --group docs
+      - run: uv run mkdocs build
+      - uses: actions/upload-pages-artifact@v3
+        with:
+          path: site
+
+  deploy:
+    needs: build
+    runs-on: ubuntu-latest
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    steps:
+      - id: deployment
+        uses: actions/deploy-pages@v4

{chromatic_python-0.7.2 → chromatic_python-0.7.3}/PKG-INFO

@@ -1,10 +1,11 @@
 Metadata-Version: 2.4
 Name: chromatic-python
-Version: 0.7.2
+Version: 0.7.3
 Summary: ANSI art image processing and colored terminal text
 Author: crypt0lith
 License-Expression: MIT
-Project-URL: repository, https://github.com/crypt0lith/chromatic.git
+Project-URL: Homepage, https://github.com/crypt0lith/chromatic
+Project-URL: Documentation, https://crypt0lith.github.io/chromatic
 Keywords: ansi,ascii,art,font,image,terminal,parser
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
@@ -15,9 +16,9 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Typing :: Typed
 Requires-Python: <4.0,>=3.12
 Description-Content-Type: text/markdown
-Requires-Dist: numpy<2.6,>=1.25.2
+Requires-Dist: numpy<2.8,>=2.1
 Requires-Dist: pillow>=12.2.0
-Requires-Dist: scipy<2.0,>=1.11.4
+Requires-Dist: scipy>=1.11.4
 Requires-Dist: opencv-python
 Requires-Dist: fonttools>=4.60.2
 Requires-Dist: lazy_loader

{chromatic_python-0.7.2 → chromatic_python-0.7.3}/chromatic/__init__.pyi

@@ -4,6 +4,7 @@ __all__ = [
     "ColorNamespace",
     "ColorStr",
     "Fore",
+    "SgrFlag",
     "SgrParameter",
     "Style",
     "UserFont",
@@ -50,6 +51,7 @@ from .color import (
     ColorNamespace,
     ColorStr,
     Fore,
+    SgrFlag,
     SgrParameter,
     Style,
     ansicolor4Bit,

{chromatic_python-0.7.2 → chromatic_python-0.7.3}/chromatic/__main__.py

@@ -1,3 +1,4 @@
+# vim: foldmethod=marker foldenable
 import collections.abc as abc
 import os
 import sys
@@ -9,6 +10,8 @@ from inspect import signature
 def parse_args():
     import argparse as ap
 
+    from . import __version__
+
     class SetEnvAction(ap.Action):
         def __init__(self, *args, **kwargs):
             if kwargs.get("nargs") not in ("?", None):
@@ -37,7 +40,7 @@ def parse_args():
             out = super()._get_help_string(action)
             if out is not None and isinstance(action, SetEnvAction):
                 out += " (env: {}={})".format(
-                    *(lambda s: (s, os.environ.get(s, "")))(action.env)
+                    action.env, os.environ.get(action.env, "")
                 )
             return out
 
@@ -63,21 +66,57 @@ def parse_args():
 
     font_dir_env_base = init_font_dir_env_parser()
 
-    if os.path.isfile(sys.argv[0]) and os.path.samefile(sys.argv[0], __file__):
-        top_parser = ap.ArgumentParser(prog=__package__)
-    else:
-        top_parser = ap.ArgumentParser()
+    from .color.palette import ColorNamespace
 
-    cmd_subparsers = top_parser.add_subparsers(dest="cmd", required=True)
+    color_ns = ColorNamespace.asdict()
+
+    def ColorArgType(allow_rgba=False):
+        def color_arg(s: str, /) -> tuple[int, int, int, int] | tuple[int, int, int]:
+            try:
+                return color_ns[s.strip().replace(" ", "_").upper()]
+            except KeyError:
+                if any(c not in "0123456789abcdef" for c in s.casefold()):
+                    raise
+            n = len(s)
+            if allow_rgba and n % 4 == 0:
+                if n == 4:
+                    s = "".join(c * 2 for c in s)
+                x = int(s, 16)
+                if not 0 <= x < (1 << 32):
+                    raise ValueError(f"{x:#x} is not u32")
+                return (
+                        (x >> 24)   & 0xFF,
+                        (x >> 16)   & 0xFF,
+                        (x >>  8)   & 0xFF,
+                         x          & 0xFF,
+                    )               # fmt: skip
+            elif n % 3 == 0:
+                if n == 3:
+                    s = "".join(c * 2 for c in s)
+                x = int(s, 16)
+                if not 0 <= x < (1 << 24):
+                    raise ValueError(f"{x:#x} is not u24")
+                return (x >> 16) & 0xFF, (x >> 8) & 0xFF, x & 0xFF
+            raise ValueError(
+                "expected hex digit with nbytes in {}, got {}".format(
+                    (3, 4, 6, 8), int(s, 16).bit_length() // 8
+                )
+            )
+
+        return color_arg
 
     def init_font_subcmds(parser: ap.ArgumentParser):
         subcmds = parser.add_subparsers(dest="subcmd", required=True)
+
         mut_by_name_base = new_base_parser()
         mut_by_name_base.add_argument(
             dest="name", metavar="NAME", help="name of the registered font"
         )
+
         uf_attr_base = new_base_parser()
+
         uf_attr_opts = uf_attr_base.add_argument_group("font attribute options")
+        # font attribute options {{{
         uf_attr_opts.add_argument(
             "--size", dest="size", type=int, help="size in pixels"
         )
@@ -96,6 +135,9 @@ def parse_args():
             action=ap.BooleanOptionalAction,
             help="whether to set this font as the new default font",
         )
+        # }}}
+
+        # subcommands: font {{{
         subcmds.add_parser(
             "delete",
             parents=[font_dir_env_base, mut_by_name_base],
@@ -134,12 +176,18 @@ def parse_args():
             set a user font as the default font.
             it will be accessible as `{__package__}.DEFAULT_FONT`""",
         )
+        # }}}
+
+        # font edit {{{
         p_edit_font_opts = subcmd_p_edit.add_argument_group(
             "font options", argument_default=ap.SUPPRESS
         )
         p_edit_font_opts.add_argument(
             "--font", dest="font", metavar="FILE", help="path to truetype font file"
         )
+        # }}}
+
+        # font list {{{
         p_list_fmt_opts = subcmd_p_list.add_argument_group("formatting options")
         p_list_fmt_opts.add_argument(
             "--json",
@@ -147,6 +195,9 @@ def parse_args():
             action="store_true",
             help="emit entries in JSON format",
         )
+        # }}}
+
+        # font register {{{
         subcmd_p_register.add_argument(
             dest="font", metavar="FONT", help="path to truetype font file"
         )
@@ -167,16 +218,77 @@ def parse_args():
             create a symlink instead of copying the file.
             like `ln -s TARGET LINK_NAME`, this will fail if the link name already exists""",
         )
+        # }}}
+
+        # font rename {{{
         subcmd_p_rename.add_argument(
             dest="newname",
             metavar="NEWNAME",
             help="new name to give the registered font",
         )
+        # }}}
 
     def init_image_subcmds(parser: ap.ArgumentParser):
+        def save_img_callback(path: str | os.PathLike[str] | None = None, /):
+
+            # deferred exception handler
+            # on write error, fall-through to Image.show()
+            # then re-raise after in-memory image is opened
+
+            from functools import wraps
+
+            def defer_exc[**P, R](
+                f: abc.Callable[P, abc.Generator[Exception, tp.Any, R]], /
+            ):
+                @wraps(f)
+                def wrapper(*args: P.args, **kwargs: P.kwargs) -> R:
+                    err = None
+                    it = f(*args, **kwargs)
+                    try:
+                        while True:
+                            err = next(it)
+                    except StopIteration as stop:
+                        return stop.value
+                    finally:
+                        if err is not None:
+                            raise err
+
+                return wrapper
+
+            import PIL.Image
+
+            @defer_exc
+            def callback(ns: ap.Namespace, img: PIL.Image.Image):
+                if path is not None:
+                    try:
+                        img.save(path)
+                    except Exception as e:
+                        yield e
+                    else:
+                        if getattr(ns, "show", False):
+                            with PIL.Image.open(path) as f:
+                                f.show()
+                        return path
+                dump_stdout = hasattr(ns, "dumpfile") and ns.dumpfile.fileno() == 1
+                if getattr(ns, "show", not dump_stdout):
+                    img.show()
+
+            return callback
+
+        def save_img_to_dir(dirname: str, /):
+            from datetime import datetime
+            from pathlib import Path
+
+            timestamp = datetime.now().strftime("%Y%m%d%H%M%S")
+            outfile = Path(dirname, f"{__package__}_{timestamp}.png")
+            return save_img_callback(outfile)
+
         subcmds = parser.add_subparsers(dest="subcmd", required=True)
+
         ansify_base = new_base_parser()
+
         font_opts = ansify_base.add_argument_group("font options")
+        # font options {{{
         font_opts.add_argument(
             "--font",
             dest="font",
@@ -189,61 +301,22 @@ def parse_args():
             metavar="SIZE",
             help="font size, in pixels",
         )
-
-        from .color.palette import ColorNamespace
-
-        color_ns = ColorNamespace.asdict()
-
-        def color_parser(allow_rgba=False):
-            def parsed_color(
-                s: str, /
-            ) -> tuple[int, int, int, int] | tuple[int, int, int]:
-                try:
-                    return color_ns[s.strip().replace(" ", "_").upper()]
-                except KeyError:
-                    if any(c not in "0123456789abcdef" for c in s.casefold()):
-                        raise
-                n = len(s)
-                if allow_rgba and n % 4 == 0:
-                    if n == 4:
-                        s = "".join(c * 2 for c in s)
-                    x = int(s, 16)
-                    if not 0 <= x < (1 << 32):
-                        raise ValueError(f"{x:#x} is not u32")
-                    return (
-                        (x >> 24)   & 0xFF,
-                        (x >> 16)   & 0xFF,
-                        (x >>  8)   & 0xFF,
-                         x          & 0xFF,
-                    )               # fmt: skip
-                elif n % 3 == 0:
-                    if n == 3:
-                        s = "".join(c * 2 for c in s)
-                    x = int(s, 16)
-                    if not 0 <= x < (1 << 24):
-                        raise ValueError(f"{x:#x} is not u24")
-                    return (x >> 16) & 0xFF, (x >> 8) & 0xFF, x & 0xFF
-                raise ValueError(
-                    "expected hex digit with nbytes in {}, got {}".format(
-                        (3, 4, 6, 8), int(s, 16).bit_length() // 8
-                    )
-                )
-
-            return parsed_color
+        # }}}
 
         color_opts = ansify_base.add_argument_group("color defaults")
+        # color defaults {{{
         color_opts.add_argument(
             "--bg",
             dest="bg_default",
             metavar="COLOR",
-            type=color_parser(allow_rgba=True),
+            type=ColorArgType(allow_rgba=True),
             help="default background color. can be hex rgb(a) value or color name",
         )
         color_opts.add_argument(
             "--fg",
             dest="fg_default",
             metavar="COLOR",
-            type=color_parser(allow_rgba=True),
+            type=ColorArgType(allow_rgba=True),
             help="default foreground color. can be hex rgb(a) value or color name",
         )
         color_opts.add_argument(
@@ -252,10 +325,12 @@ def parse_args():
             action="store_true",
             help="use alpha channel with defaults: bg=0, fg=0xFF",
         )
+        # }}}
 
         from_img_base = new_base_parser()
 
         colorize_opts = from_img_base.add_argument_group("colorization options")
+        # colorization options {{{
         colorize_opts.add_argument(
             "-a",
             "--ansi-type",
@@ -266,6 +341,7 @@ def parse_args():
             since truecolor is rgb, '24b' effectively means 'original colors'
             (choices: %(choices)s)""",
         )
+
         equalize_opts = colorize_opts.add_mutually_exclusive_group()
         equalize_opts.add_argument(
             "--equalize",
@@ -281,18 +357,22 @@ def parse_args():
             const="white_point",
             help="apply white-point equalization before image-to-ansi conversion",
         )
+
         colorize_opts.add_argument(
             "--input-bg",
             dest="bg",
             metavar="COLOR",
-            type=color_parser(),
+            type=ColorArgType(),
             default=None,
             help="""\
             initial background (canvas) color,
             injected as an attribute on the intermediate text object itself.
             can be hex rgb value or color name""",
         )
+        # }}}
+
         glyph_opts = from_img_base.add_argument_group("glyph options")
+        # glyph options {{{
         glyph_opts.add_argument(
             "--factor",
             dest="factor",
@@ -302,7 +382,15 @@ def parse_args():
             scaling factor for image width to %(metavar)s columns per output line.
             analogous to level-of-detail""",
         )
+
         char_set_opts = glyph_opts.add_mutually_exclusive_group()
+
+        from .image._curses import ascii_printable, cp437_printable
+
+        # char_set {{{
+        char_set_preset_help = (
+            "use printable characters from {} character encoding as charset"
+        ).format
         char_set_opts.add_argument(
             "-c",
             "--chars",
@@ -312,12 +400,6 @@ def parse_args():
             charset where %(metavar)s is a string containing chars to use for glyph selection.
             a char can appear more than once, which affects frequency distribution""",
         )
-
-        from .image._curses import ascii_printable, cp437_printable
-
-        char_set_preset_help = (
-            "use printable characters from {} character encoding as charset"
-        ).format
         char_set_opts.add_argument(
             "--ascii",
             dest="char_set",
@@ -350,8 +432,10 @@ def parse_args():
                 )
             ),
         )
+        # }}}
 
         glyph_sort_opts = glyph_opts.add_mutually_exclusive_group()
+        # sort_glyphs {{{
         glyph_sort_opts.add_argument(
             "--sort",
             dest="sort_glyphs",
@@ -370,63 +454,13 @@ def parse_args():
             sort glyphs in reverse order.
             flips the luminance mapping to (light -> dark)""",
         )
-
-        def save_img_callback(path: str | os.PathLike[str] | None = None, /):
-
-            # deferred exception handler
-            # on write error, fall-through to Image.show()
-            # then re-raise after in-memory image is opened
-
-            from functools import wraps
-
-            def defer_exc[**P, R](
-                f: abc.Callable[P, abc.Generator[Exception, tp.Any, R]], /
-            ):
-                @wraps(f)
-                def wrapper(*args: P.args, **kwargs: P.kwargs) -> R:
-                    err = None
-                    it = f(*args, **kwargs)
-                    try:
-                        while True:
-                            err = next(it)
-                    except StopIteration as stop:
-                        return stop.value
-                    finally:
-                        if err is not None:
-                            raise err
-
-                return wrapper
-
-            import PIL.Image
-
-            @defer_exc
-            def callback(ns: ap.Namespace, img: PIL.Image.Image):
-                if path is not None:
-                    try:
-                        img.save(path)
-                    except Exception as e:
-                        yield e
-                    else:
-                        if getattr(ns, "show", False):
-                            with PIL.Image.open(path) as f:
-                                f.show()
-                        return path
-                dump_stdout = hasattr(ns, "dumpfile") and ns.dumpfile.fileno() == 1
-                if getattr(ns, "show", not dump_stdout):
-                    img.show()
-
-            return callback
-
-        def save_img_to_dir(dirname: str, /):
-            from datetime import datetime
-            from pathlib import Path
-
-            timestamp = datetime.now().strftime("%Y%m%d%H%M%S")
-            outfile = Path(dirname, f"{__package__}_{timestamp}.png")
-            return save_img_callback(outfile)
+        # }}}
+        # }}}
 
         output_opts_base = new_base_parser()
+
         output_opts = output_opts_base.add_argument_group("output options")
+        # output options {{{
         outfile_opts = output_opts.add_mutually_exclusive_group()
         outfile_opts.add_argument(
             "-O",
@@ -466,14 +500,32 @@ def parse_args():
             help="write the ansified image text to stdout",
         )
         output_opts_base.set_defaults(_outfile_callback=save_img_callback())
+        # }}}
+
+        # subcommands: image {{{
         subcmd_p_ansify = subcmds.add_parser(
             "ansify",
             parents=[font_dir_env_base, ansify_base, from_img_base, output_opts_base],
             formatter_class=EnvHelpFormatter,
         )
+        # }}}
+
+        # image ansify {{{
         subcmd_p_ansify.add_argument(
             dest="img", metavar="IMAGEFILE", help="input image"
         )
+        # }}}
+
+    if os.path.isfile(sys.argv[0]) and os.path.samefile(sys.argv[0], __file__):
+        top_parser = ap.ArgumentParser(prog=__package__)
+    else:
+        top_parser = ap.ArgumentParser()
+
+    top_parser.add_argument(
+        "-V", "--version", action="version", version=f"%(prog)s {__version__}"
+    )
+
+    cmd_subparsers = top_parser.add_subparsers(dest="cmd", required=True)
 
     font_cmd_subparser = cmd_subparsers.add_parser("font")
     image_cmd_subparser = cmd_subparsers.add_parser("image")

{chromatic_python-0.7.2 → chromatic_python-0.7.3}/chromatic/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.7.2'
-__version_tuple__ = version_tuple = (0, 7, 2)
+__version__ = version = '0.7.3'
+__version_tuple__ = version_tuple = (0, 7, 3)
 
-__commit_id__ = commit_id = 'g7703f67b1'
+__commit_id__ = commit_id = 'g9af897cd5'

{chromatic_python-0.7.2 → chromatic_python-0.7.3}/chromatic/color/__init__.pyi

@@ -8,6 +8,7 @@ __all__ = [
     "DEFAULT_ANSI",
     "Fore",
     "SGR_RESET",
+    "SgrFlag",
     "SgrParameter",
     "SgrSequence",
     "Style",
@@ -24,8 +25,12 @@ __all__ = [
     "hsv2rgb",
     "int2rgb",
     "is_u24",
+    "lab2lch",
     "lab2rgb",
     "lab2xyz",
+    "lch2lab",
+    "lch2rgb",
+    "lerp_lch",
     "named_color",
     "nearest_ansi_4bit_rgb",
     "nearest_ansi_8bit_rgb",
@@ -36,6 +41,7 @@ __all__ = [
     "rgb2hsv",
     "rgb2int",
     "rgb2lab",
+    "rgb2lch",
     "rgb2xyz",
     "rgb_diff",
     "rgb_dispatch",
@@ -54,8 +60,12 @@ from .colorconv import (
     hsv2rgb,
     int2rgb,
     is_u24,
+    lab2lch,
     lab2rgb,
     lab2xyz,
+    lch2lab,
+    lch2rgb,
+    lerp_lch,
     nearest_ansi_4bit_rgb,
     nearest_ansi_8bit_rgb,
     rgb2hexstr,
@@ -63,6 +73,7 @@ from .colorconv import (
     rgb2hsv,
     rgb2int,
     rgb2lab,
+    rgb2lch,
     rgb2xyz,
     rgb_diff,
     rgb_to_ansi_8bit,
@@ -75,6 +86,7 @@ from .core import (
     SGR_RESET,
     Color,
     ColorStr,
+    SgrFlag,
     SgrParameter,
     SgrSequence,
     ansicolor4Bit,