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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chromatic-python
-Version: 0.7.3
+Version: 0.7.4
 Summary: ANSI art image processing and colored terminal text
 Author: crypt0lith
 License-Expression: MIT

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

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

{chromatic_python-0.7.3 → chromatic_python-0.7.4}/chromatic/color/core.py

@@ -780,6 +780,7 @@ def _iter_sgr[_T: (abc.Buffer, tp.SupportsInt)](
 
 class SgrSequence(abc.MutableSequence[SgrParamBuffer]):
     """Construct a mutable sequence of SGR code bytes."""
+
     _idx_attrs = ("_fg_idx", "_bg_idx")
     _key2idx = mappingproxy(dict(zip(("fg", "bg"), _idx_attrs)))
     _reset2idx = mappingproxy(dict(zip((b"39", b"49"), _idx_attrs)))
@@ -939,37 +940,25 @@ class SgrSequence(abc.MutableSequence[SgrParamBuffer]):
 
         """
 
+        K2I = {
+            k: i for i, ks in enumerate(zip((b"39", b"49"), ("fg", "bg"))) for k in ks
+        }
         buf = []
         seen = set()
-        seen_fg = seen_bg = False
+        seen_colors = [False] * 2
         for x in reversed(self):
             if x in seen:
                 continue
             seen.add(x)
-            if x == b"0":
+            v = x._value
+            if v == b"0":
                 buf.append(x)
                 break
-            elif x == b"39":
-                if not seen_fg:
-                    buf.append(x)
-                    seen_fg = True
-                continue
-            elif x == b"49":
-                if not seen_bg:
-                    buf.append(x)
-                    seen_bg = True
-                continue
-            elif not x.is_color():
-                buf.append(x)
-                continue
-            elif x._value.kind() == "fg":
-                if seen_fg:
+            elif v in K2I or x.is_color():
+                idx = K2I[getattr(v, "kind", lambda: v)()]
+                if seen_colors[idx]:
                     continue
-                seen_fg = True
-            elif seen_bg:
-                continue
-            else:
-                seen_bg = True
+                seen_colors[idx] = True
             buf.append(x)
         self[:] = buf[::-1]
 

{chromatic_python-0.7.3 → chromatic_python-0.7.4}/chromatic/color/palette.py

@@ -449,7 +449,83 @@ _rgb_lookup = _DynamicNSMeta(
 )._getmember
 
 
-def rgb_dispatch(*names):
+def rgb_dispatch(*names, replace_defaults=True):
+    """Returns a decorator which intercepts input arguments that are color
+    name strings, and replaces those arguments with their RGB tuple
+    counterparts before passing them to the wrapped function.
+
+    In the bare form, ie. ``@rgb_dispatch``, the decorator treats all
+    positional-only and variadic positional parameters as assignable.
+
+    In the named form, ie. ``@rgb_dispatch("a", "b", "c")``, the decorator
+    will only attempt to match and replace those parameter names, regardless
+    of their parameter kind.
+
+    Parameters
+    ----------
+    *names : str
+        Parameter names to target for color name to RGB tuple replacement.
+    replace_defaults : bool, default=True
+        Whether to replace default argument values of the returned callable.
+
+    Examples
+    --------
+    >>> from chromatic.color.palette import rgb_dispatch
+    >>> @rgb_dispatch
+    ... def func(r="red", b="blue", g="green", x="not a color", /):
+    ...     return r, g, b, x
+    ...
+    >>> func()
+    ((255, 0, 0), (0, 128, 0), (0, 0, 255), 'not a color')
+    >>> func(None, None, None, "Hot Pink")
+    (None, None, None, (255, 105, 180))
+
+    >>> @rgb_dispatch
+    ... def func(a, b, c, /, *args):
+    ...     return a, b, c, *args
+    ...
+    >>> func("red", "yellow", "pink", "dark magenta", "alice blue")
+    ((255, 0, 0), (255, 255, 0), (255, 192, 203), (139, 0, 139), (240, 248, 255))
+
+    >>> @rgb_dispatch("c")
+    ... def func(a, b, c, /, *args):
+    ...     return a, b, c, *args
+    ...
+    >>> func("red", "yellow", "pink", "dark magenta", "alice blue")
+    ('red', 'yellow', (255, 192, 203), 'dark magenta', 'alice blue')
+
+    >>> @rgb_dispatch("color")
+    ... def func(**kwargs):
+    ...     return kwargs
+    ...
+    >>> func(color="red")
+    {'color': (255, 0, 0)}
+
+    >>> @rgb_dispatch("kwargs")
+    ... def func(**kwargs):
+    ...     return kwargs
+    ...
+    >>> func(color1="red", color2="yellow", color3="orange")
+    {'color1': (255, 0, 0), 'color2': (255, 255, 0), 'color3': (255, 165, 0)}
+
+    >>> @rgb_dispatch("kwargs")
+    ... def func(a=None, /, **kwargs):
+    ...     return a, kwargs
+    ...
+    >>> func(a="green")
+    (None, {'a': (0, 128, 0)})
+
+    >>> @rgb_dispatch(replace_defaults=False)
+    ... def func(fruit_or_color="orange", /):
+    ...     res = "fruit" if isinstance(fruit_or_color, str) else "color"
+    ...     return f"{fruit_or_color} is a {res}"
+    ...     
+    >>> func()
+    'orange is a fruit'
+    >>> func("orange")
+    '(255, 165, 0) is a color'
+    """
+
     def decorator(f: types.FunctionType, /):
         def _prepare():
             assert isinstance(names, set)
@@ -463,16 +539,6 @@ def rgb_dispatch(*names):
             has_varkwds = bool(flags & 0x8)
             total = sum([n_args, n_kwonly, has_varargs, has_varkwds])
             params = list(code.co_varnames[:total])
-            if not names:
-                names.update(
-                    name
-                    for name in params
-                    if (
-                        name in {"bg", "fg"}
-                        or name.startswith(("bg_", "fg_"))
-                        or name.endswith(("_bg", "_fg"))
-                    )
-                )
             mask_params = {name: name in names for name in params}
             positions, keywords = [], {}
             if names:
@@ -481,40 +547,37 @@ def rgb_dispatch(*names):
                     raise ValueError(f"unexpected parameter names: {unexpected}")
             elif total == 0 or not (n_pos_or_kw or n_kwonly or has_varkwds):
                 if total > 0:
-                    positions.append(slice(None))
+                    positions.extend(range(n_posonly))
+                    positions.append(slice(n_posonly, None))
                 return tuple(positions), mappingproxy(keywords)
             else:
                 raise ValueError("no parameters specified and none could be inferred")
             i = 0
             if n_posonly > 0:
-                posonly = params[:n_posonly]
-                for name in posonly:
+                for name in params[:n_posonly]:
                     if mask_params[name]:
                         positions.append(i)
                     i += 1
                 del params[:n_posonly]
             if n_pos_or_kw > 0:
-                pos_or_kw = params[:n_pos_or_kw]
-                for name in pos_or_kw:
+                for name in params[:n_pos_or_kw]:
                     if mask_params[name]:
                         positions.append(i)
                         keywords[name] = positions[-1]
                     i += 1
                 del params[:n_pos_or_kw]
             if n_kwonly > 0:
-                kwonly = params[:n_kwonly]
-                for name in kwonly:
+                for name in params[:n_kwonly]:
                     if mask_params[name]:
                         keywords[name] = None
                 del params[:n_kwonly]
             if has_varargs:
-                varargs = params.pop(0)
-                if mask_params[varargs]:
+                if mask_params[params.pop(0)]:
                     positions.append(slice(i, None))
             if has_varkwds:
-                varkwds = params.pop(0)
-                if mask_params[varkwds]:
+                if mask_params[params.pop(0)]:
                     keywords[None] = None
+                keywords |= dict.fromkeys(names.difference(code.co_varnames[:total]))
             return tuple(positions), mappingproxy(keywords)
 
         POSITIONS, KEYWORDS = _prepare()
@@ -530,25 +593,21 @@ def rgb_dispatch(*names):
                 for i, (j, x) in zip(
                     range(argcount - len(argdefs), argcount), enumerate(argdefs)
                 ):
-                    if not (i in POSITIONS and isinstance(x, str)):
-                        continue
-                    try:
-                        buf[j] = _rgb_lookup(x)
-                    except KeyError:
-                        continue
-                    else:
+                    if i in POSITIONS and isinstance(x, str):
+                        try:
+                            buf[j] = _rgb_lookup(x)
+                        except KeyError:
+                            continue
                         changed = True
                 argdefs = tuple(buf)
             if kwdefaults is not None:
                 kwdefaults = kwdefaults.copy()
                 for k, v in kwdefaults.items():
-                    if not (k in KEYWORDS and isinstance(v, str)):
-                        continue
-                    try:
-                        kwdefaults[k] = _rgb_lookup(v)
-                    except KeyError:
-                        continue
-                    else:
+                    if k in KEYWORDS and isinstance(v, str):
+                        try:
+                            kwdefaults[k] = _rgb_lookup(v)
+                        except KeyError:
+                            continue
                         changed = True
             if not changed:
                 return f
@@ -573,13 +632,14 @@ def rgb_dispatch(*names):
             setattr(f_new, "__wrapped__", f)
             return f_new
 
-        f = _replace_defaults()
+        if replace_defaults:
+            f = _replace_defaults()
 
         @ft.wraps(f)
         def wrapper(*args, **kwargs):
             _kwargs = kwargs.copy()
             n_args = len(args)
-            mask = [False for _ in range(n_args)]
+            mask = [False] * n_args
             for idx in POSITIONS:
                 if isinstance(idx, slice):
                     for i in range(*idx.indices(n_args)):
@@ -587,29 +647,23 @@ def rgb_dispatch(*names):
                 elif idx < n_args:
                     mask[idx] = True
             for k, v in kwargs.items():
-                if not isinstance(v, str):
-                    continue
-                if not (k in KEYWORDS or HAS_VARKW):
-                    continue
-                try:
-                    v = _rgb_lookup(v)
-                except KeyError:
-                    continue
-                _kwargs[k] = v
-                if (i := KEYWORDS.get(k)) is None or i >= n_args:
-                    continue
-                mask[i] = False
+                if (k in KEYWORDS or HAS_VARKW) and isinstance(v, str):
+                    try:
+                        v = _rgb_lookup(v)
+                    except KeyError:
+                        continue
+                    _kwargs[k] = v
+                    if (i := KEYWORDS.get(k)) is None or i >= n_args:
+                        continue
+                    mask[i] = False
             _args = []
             for g, v in zip(mask, args):
-                if not (g and isinstance(v, str)):
-                    _args.append(v)
-                    continue
-                try:
-                    res = _rgb_lookup(v)
-                except KeyError:
-                    _args.append(v)
-                    continue
-                _args.append(res)
+                if g and isinstance(v, str):
+                    try:
+                        v = _rgb_lookup(v)
+                    except KeyError:
+                        pass
+                _args.append(v)
             return f(*_args, **_kwargs)
 
         return wrapper

{chromatic_python-0.7.3 → chromatic_python-0.7.4}/chromatic/color/palette.pyi

@@ -265,10 +265,12 @@ class AnsiFore(ColorNamespace[_frozen_color_chain]):
     def __call__(self, fg: _ColorLike) -> color_chain: ...
 
 @tp.overload
-def rgb_dispatch[_F: abc.Callable[..., tp.Any]](f: _F, /, *names: str) -> _F: ...
+def rgb_dispatch[_F: abc.Callable[..., tp.Any]](
+    f: _F, /, *names: str, replace_defaults: bool = True
+) -> _F: ...
 @tp.overload
 def rgb_dispatch[_F: abc.Callable[..., tp.Any]](
-    *names: str,
+    *names: str, replace_defaults: bool = True
 ) -> abc.Callable[[_F], _F]: ...
 
 named_color: MappingProxyType[str | tuple[str, tp.Literal["4b", "24b"]], Color]

{chromatic_python-0.7.3 → chromatic_python-0.7.4}/chromatic_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chromatic-python
-Version: 0.7.3
+Version: 0.7.4
 Summary: ANSI art image processing and colored terminal text
 Author: crypt0lith
 License-Expression: MIT

chromatic_python-0.7.4/chromatic_python.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "0.7.4",
+  "distance": 0,
+  "node": "gbbb16e4437791f8a31ab74d68f7d176626c3b88e",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-08-27"
+}

chromatic_python-0.7.3/chromatic_python.egg-info/scm_version.json

@@ -1,8 +0,0 @@
-{
-  "tag": "0.7.3",
-  "distance": 0,
-  "node": "g9af897cd5123a20ec3673f13fe8caac8a3f73bb3",
-  "dirty": false,
-  "branch": "HEAD",
-  "node_date": "2026-08-26"
-}