monobiome 1.5.1__py3-none-any.whl → 1.5.4__py3-none-any.whl

monobiome/palette.py

@@ -5,6 +5,10 @@ from importlib.metadata import version
 
 from coloraide import Color
 
+from monobiome.util import (
+    hex_from_rgb8,
+    srgb8_from_color,
+)
 from monobiome.constants import (
     h_map,
     L_points,
@@ -24,8 +28,8 @@ def compute_hlc_map(notation: str) -> dict[str, Any]:
             oklch = Color('oklch', [_l/100, _c, _h])
 
             if notation == "hex":
-                srgb = oklch.convert('srgb')
-                c_str = srgb.to_string(hex=True)
+                rgb8 = srgb8_from_color(oklch)
+                c_str = hex_from_rgb8(rgb8)
             elif notation == "oklch":
                 ol, oc, oh = oklch.convert('oklch').coords()
                 c_str = f"oklch({ol*100:.1f}% {oc:.4f} {oh:.1f})"

monobiome/plotting.py

@@ -5,6 +5,7 @@ import matplotlib.pyplot as plt
 from coloraide import Color
 from matplotlib.collections import LineCollection
 
+from monobiome.util import srgb8_from_color
 from monobiome.palette import compute_hlc_map
 from monobiome.constants import (
     h_map,
@@ -87,7 +88,9 @@ def plot_hue_chroma_star() -> tuple[plt.Figure, plt.Axes]:
 
         _h = h_map[h_str]
         h_colors = [
-            Color('oklch', [_l/100, _c, _h]).convert("srgb")
+            Color(
+                'oklch', [_l/100, _c, _h]
+            ).convert("srgb").fit(method="oklch-chroma")
             for _l, _c in zip(L_points, Lpoints_Cstar, strict=True)
         ]
         
@@ -124,7 +127,7 @@ def palette_image(
 
     h = row_count * cell_size
     w = max_cols * cell_size
-    img = np.ones((h, w, 3), float)
+    img = np.ones((h, w, 3), int)
 
     lightness_keys_per_row = []
 
@@ -133,8 +136,7 @@ def palette_image(
         lkeys = sorted(shades.keys())
         lightness_keys_per_row.append(lkeys)
         for c, k in enumerate(lkeys):
-            col = Color(shades[k]).convert("srgb").fit(method="clip")
-            rgb = [col["r"], col["g"], col["b"]]
+            rgb = srgb8_from_color(shades[k])
             r0, r1 = r * cell_size, (r + 1) * cell_size
             c0, c1 = c * cell_size, (c + 1) * cell_size
             img[r0:r1, c0:c1, :] = rgb
@@ -156,7 +158,7 @@ def show_palette(
     if show_labels:
         fig, ax = plt.subplots(figsize=(fig_w, fig_h), dpi=dpi)
 
-        ax.imshow(img, interpolation="none", origin="upper")
+        ax.imshow(img, interpolation="nearest", origin="upper")
         ax.set_xticks([])
 
         ytick_pos = [(i + 0.5) * cell_size for i in range(len(names))]

monobiome/util.py

@@ -2,6 +2,7 @@ import math
 from types import GenericAlias
 from argparse import ArgumentParser, _SubParsersAction
 
+import numpy as np
 from coloraide import Color
 
 _SubParsersAction.__class_getitem__ = classmethod(GenericAlias)
@@ -33,3 +34,13 @@ def oklch_distance(xc: Color, yc: Color) -> float:
     dz = l1 - l2
     
     return (dx**2 + dy**2 + dz**2)**0.5
+
+def srgb8_from_color(c: str | Color) -> np.ndarray:
+    c = Color(c).convert("srgb").fit(method="oklch-chroma")
+    rgb = np.array([c["r"], c["g"], c["b"]], dtype=float)
+    rgb8 = np.clip(np.round(rgb * 255), 0, 255).astype(np.uint8)
+
+    return rgb8
+
+def hex_from_rgb8(rgb8: np.ndarray) -> str:
+    return f"#{int(rgb8[0]):02x}{int(rgb8[1]):02x}{int(rgb8[2]):02x}"

{monobiome-1.5.1.dist-info → monobiome-1.5.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: monobiome
-Version: 1.5.1
+Version: 1.5.4
 Summary: Monobiome color palette
 Author-email: Sam Griesemer <git@olog.io>
 License-Expression: MIT
@@ -72,11 +72,11 @@ smoothly as a function of lightness within sRGB gamut bounds.
 
 | Chroma curves                                            | Color trajectories                       |
 |----------------------------------------------------------|------------------------------------------|
-| ![Chroma curves](images/release/1.5.1/chroma-curves.png) | ![Trajectories](images/trajectories.gif) |
+| ![Chroma curves](images/release/1.5.4/chroma-curves.png) | ![Trajectories](images/trajectories.gif) |
 
 | Palette                                      |
 |----------------------------------------------|
-| ![Palette](images/release/1.5.1/palette.png) |
+| ![Palette](images/release/1.5.4/palette.png) |
 
 Chroma curves are designed specifically to establish a distinct role for each
 accent and are non-intersecting over the lightness domain (hence the distinct
@@ -183,6 +183,13 @@ using the `monobiome` CLI:
   (`grassland`). Every part of this process can be customized: the scheme
   parameters, the scheme definitions/file, the app template.
 
+The separation of duties here facilitates robustness: the palette colors can be
+tweaked (across versions, say) without changing how those colors get used in
+app themes. Scheme files don't hardcode color values, and app templates don't
+refer to palette variables at all. Scheme files bridge palette colors with
+*intended uses*, and templates need only align those uses under an app's
+expected config syntax.
+
 Running these commands in sequence from the repo root should work
 out-of-the-box after having installed the CLI tool.
 

{monobiome-1.5.1.dist-info → monobiome-1.5.4.dist-info}/RECORD

@@ -2,17 +2,17 @@ monobiome/__init__.py,sha256=ChC5YFLK0kgvi0MJwD68LtZgUMJVCtNbtY32UQTvdA4,75
 monobiome/__main__.py,sha256=4K-CQWWiSXQbXgNLPqdOts6R3wOJeDJ0ygSARPI-eiA,439
 monobiome/constants.py,sha256=zkIDBtPS3unt9EulnTfpJV8r82Cc1Q-8c7u2Y2jcgBY,3694
 monobiome/curve.py,sha256=4IMn-YksJrqMOR-oYjA9oIJChI_Hz11AmynhYjLXl48,1754
-monobiome/palette.py,sha256=EhB90k1XINzbCxU8bBWc_fnEtbOXoJYfwAbtyx1nG-g,1505
-monobiome/plotting.py,sha256=pRGIsdW8SfjUbfEy8IZhLwzX5au6xc6vwtnDZymScvU,6127
+monobiome/palette.py,sha256=DdyJSc3ADRV2dw6--0mK2VWm5fz3nU3RBJ3hJTWzpFU,1574
+monobiome/plotting.py,sha256=DN_sjDrnt5sAZWQ7bXzs-YDef3ieiuLVrp9xMTdojzE,6156
 monobiome/scheme.py,sha256=5AwQW5Ibs-B7ZahGSXSmTE7CFZUpk3SKN42Qo-EW2AM,7793
-monobiome/util.py,sha256=qHLC-azOgslJcW1tNNX5TVeG3RPGpleUO2s9Nu1rbjY,1068
+monobiome/util.py,sha256=VDBTaJJuNaeb0N_8H5Wxr6VOPS8wxLzrtlDaOSqUVFE,1455
 monobiome/cli/__init__.py,sha256=bs2ZJZSWNg5tuxzAMzRzyB25Lbc4PDCVbrF2IKl2lK8,819
 monobiome/cli/fill.py,sha256=FbDpUZJegCUatFxPRk8hp4z2V93WBwqHPCOpw3rzJR4,2116
 monobiome/cli/palette.py,sha256=X1QET3UU1RxzT8D0JLWL1JKNlSQ6Dulwl1J-GLc_218,1265
 monobiome/cli/scheme.py,sha256=DNwA6Af3bJZpjImisncOgQo_kFHGTot-Ydv6o4FR1-Y,3769
 monobiome/data/parameters.toml,sha256=7ru0j_1G5rNFWc7AFKSHJUpyL_I2qdZYeDFt6q5wtQw,801
-monobiome-1.5.1.dist-info/METADATA,sha256=RBoL2842uiSvxZFi4wHxyJCX2GWFWUZm8Byus44J_Q0,14796
-monobiome-1.5.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-monobiome-1.5.1.dist-info/entry_points.txt,sha256=LpqkPxdTacTY_TaRn8eczICmPbVlXdRSoMqaxSfVxh4,54
-monobiome-1.5.1.dist-info/top_level.txt,sha256=ZA2wgRkPoG4xG0rSjyHKkuG8cdSHRr1U_DcrplXoi3A,10
-monobiome-1.5.1.dist-info/RECORD,,
+monobiome-1.5.4.dist-info/METADATA,sha256=xBo5t153BavGyDxUqvJhly-SKFms1KPf-vRSOxbxNZQ,15204
+monobiome-1.5.4.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+monobiome-1.5.4.dist-info/entry_points.txt,sha256=LpqkPxdTacTY_TaRn8eczICmPbVlXdRSoMqaxSfVxh4,54
+monobiome-1.5.4.dist-info/top_level.txt,sha256=ZA2wgRkPoG4xG0rSjyHKkuG8cdSHRr1U_DcrplXoi3A,10
+monobiome-1.5.4.dist-info/RECORD,,

{monobiome-1.5.1.dist-info → monobiome-1.5.4.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any