Update to latest ColorAide

Author: facelessuser

CHANGES.md

@@ -3,11 +3,11 @@
 ## 6.2.0
 
 - **NEW**: Since browsers do not and may not introduce Color Level 4  
-  gamut mapping at until some future spec, make gamut mapping approach  
+  gamut mapping until some future spec, make gamut mapping approach  
   configurable. Use clipping by default to match browsers as this is  
   likely what people expect even if it is not an ideal approach. Use  
-  `gamut_map` option to manually control the approach.
-- **NEW**: Upgrade ColorAide to 2.0.2.
+  `gamut_map` in settings option to manually control the approach.
+- **NEW**: Upgrade ColorAide to 2.3.
 - **FIX**: Fix regression where contrast logic could not adjust to a  
   given contrast due to a property access.
 

ch_preview.py

@@ -676,7 +676,10 @@ def set_file_scan_rules(self, view):
             ch_preview_thread.ignore_all = True
 
         view.settings().clear_on_change('color_helper.reload')
-        view.window().run_command("color_helper_preview", {"clear": True})
+        win = view.window()
+        if win is None:
+            return
+        win.run_command("color_helper_preview", {"clear": True})
 
         file_name = view.file_name()
         ext = os.path.splitext(file_name)[1].lower() if file_name is not None else None

color_helper.sublime-settings

@@ -150,6 +150,7 @@
         // "ColorHelper.lib.coloraide.spaces.rec2100_hlg.Rec2100HLG",
         // "ColorHelper.lib.coloraide.spaces.rec2100_pq.Rec2100PQ",
         // "ColorHelper.lib.coloraide.spaces.rlab.RLAB",
+        // "ColorHelper.lib.coloraide.spaces.xyb.XYB",
         // "ColorHelper.lib.coloraide.spaces.xyy.xyY",
         "ColorHelper.lib.coloraide.spaces.hsluv.HSLuv",
         "ColorHelper.lib.coloraide.spaces.lchuv.LChuv",

lib/coloraide/__meta__.py

@@ -192,5 +192,5 @@ def parse_version(ver: str) -> Version:
     return Version(major, minor, micro, release, pre, post, dev)
 
 
-__version_info__ = Version(2, 0, 2, "final")
+__version_info__ = Version(2, 3, 0, "final")
 __version__ = __version_info__._get_canonical()

lib/coloraide/algebra.py

@@ -0,0 +1,65 @@
+"""Average colors together."""
+import math
+from .types import ColorInput
+from typing import Iterable, TYPE_CHECKING, Type
+
+if TYPE_CHECKING:  # pragma: no cover
+    from .color import Color
+
+
+def average(create: Type['Color'], colors: Iterable[ColorInput], space: str, premultiplied: bool = True) -> 'Color':
+    """Average a list of colors together."""
+
+    obj = create(space, [])
+
+    # Get channel information
+    cs = obj.CS_MAP[space]
+    hue_index = cs.hue_index() if hasattr(cs, 'hue_index') else -1
+    channels = cs.channels
+    chan_count = len(channels)
+    alpha_index = chan_count - 1
+    sums = [0.0] * chan_count
+    totals = [0.0] * chan_count
+    sin = 0.0
+    cos = 0.0
+
+    # Sum channel values
+    i = -1
+    for c in colors:
+        coords = obj.update(c)[:]
+        alpha = coords[-1]
+        if math.isnan(alpha):
+            alpha = 1.0
+        i = 0
+        for coord in coords:
+            if not math.isnan(coord):
+                totals[i] += 1
+                if i == hue_index:
+                    rad = math.radians(coord)
+                    sin += math.sin(rad)
+                    cos += math.cos(rad)
+                else:
+                    sums[i] += (coord * alpha) if premultiplied and i != alpha_index else coord
+            i += 1
+
+    if i == -1:
+        raise ValueError('At least one color must be provided in order to average colors')
+
+    # Get the mean
+    alpha = sums[-1]
+    alpha_t = totals[-1]
+    sums[-1] = float('nan') if not alpha_t else alpha / alpha_t
+    alpha = sums[-1]
+    if math.isnan(alpha) or alpha in (0.0, 1.0):
+        alpha = 1.0
+    for i in range(chan_count - 1):
+        total = totals[i]
+        if not total:
+            sums[i] = float('nan')
+        elif i == hue_index:
+            sums[i] = math.degrees(math.atan2(sin / total, cos / total))
+        else:
+            sums[i] /= total * alpha if premultiplied else total
+
+    # Return the color
+    return obj.update(space, sums[:-1], sums[-1])

lib/coloraide/average.py

@@ -11,6 +11,7 @@
 from . import filters
 from . import contrast
 from . import harmonies
+from . import average
 from . import util
 from . import algebra as alg
 from itertools import zip_longest as zipl
@@ -61,7 +62,7 @@
 from .interpolate.bspline_natural import NaturalBSpline
 from .interpolate.monotone import Monotone
 from .types import Plugin
-from typing import overload, Union, Sequence, Dict, List, Optional, Any, Callable, Tuple, Type, Mapping
+from typing import overload, Union, Sequence, Iterable, Dict, List, Optional, Any, Callable, Tuple, Type, Mapping
 
 
 class ColorMatch:
@@ -131,6 +132,7 @@ class Color(metaclass=ColorMeta):
     INTERPOLATE = util.DEF_INTERPOLATE
     DELTA_E = util.DEF_DELTA_E
     HARMONY = util.DEF_HARMONY
+    AVERAGE = util.DEF_AVERAGE
     CHROMATIC_ADAPTATION = 'bradford'
     CONTRAST = 'wcag21'
 
@@ -657,7 +659,7 @@ def clip(self, space: Optional[str] = None) -> 'Color':
             space = self.space()
 
         # Convert to desired space
-        c = self.convert(space, in_place=True)
+        c = self.convert(space, in_place=True, norm=False)
         gamut.clip_channels(c)
 
         # Adjust "this" color
@@ -820,6 +822,26 @@ def interpolate(
             **kwargs
         )
 
+    @classmethod
+    def average(
+        cls,
+        colors: Iterable[ColorInput],
+        *,
+        space: Optional[str] = None,
+        out_space: Optional[str] = None,
+        premultiplied: bool = True,
+        **kwargs: Any
+    ) -> 'Color':
+        """Average the colors."""
+
+        if space is None:
+            space = cls.AVERAGE
+
+        if out_space is None:
+            out_space = space
+
+        return average.average(cls, colors, space, premultiplied).convert(out_space, in_place=True)
+
     def filter(  # noqa: A003
         self,
         name: str,

lib/coloraide/color.py

@@ -19,6 +19,7 @@
 from .spaces.cmy import CMY
 from .spaces.cmyk import CMYK
 from .spaces.xyy import xyY
+from .spaces.xyb import XYB
 from .spaces.hunter_lab import HunterLab
 from .spaces.prismatic import Prismatic
 from .spaces.rlab import RLAB
@@ -73,6 +74,7 @@ class ColorAll(Base):
         CMY(),
         CMYK(),
         xyY(),
+        XYB(),
         HunterLab(),
         Prismatic(),
         RLAB(),

lib/coloraide/everything.py

@@ -2,6 +2,7 @@
 from ..gamut import Fit, clip_channels
 from ..cat import WHITES
 from .. import util
+import math
 from typing import TYPE_CHECKING, Any, Dict
 
 if TYPE_CHECKING:  # pragma: no cover
@@ -49,7 +50,7 @@ def fit(self, color: 'Color', **kwargs: Any) -> None:
 
         # Return white or black if lightness is out of dynamic range for lightness.
         # Extreme light case only applies to SDR, but dark case applies to all ranges.
-        if sdr and lightness >= self.MAX_LIGHTNESS:
+        if sdr and (lightness >= self.MAX_LIGHTNESS or math.isclose(lightness, self.MAX_LIGHTNESS, abs_tol=1e-6)):
             clip_channels(color.update('xyz-d65', WHITE, mapcolor[-1]))
             return
         elif lightness <= self.MIN_LIGHTNESS:

lib/coloraide/gamut/fit_lch_chroma.py

@@ -665,13 +665,13 @@ def interpolator(
         if isinstance(x, stop):
             i += 1
             stops[i] = x.stop
-            color = current._handle_color_input(x.color)
+            color = current.new(x.color)
         elif callable(x):
             easing = x
             continue
         else:
             i += 1
-            color = current._handle_color_input(x)
+            color = current.new(x)
             stops[i] = None
 
         # Adjust color to space