Merge branch 'main' into implementation/scatter-marginal/pygal

Author: MarkusNeusinger

plots/scatter-marginal/implementations/python/altair.py

@@ -1,14 +1,32 @@
-""" pyplots.ai
+""" anyplot.ai
 scatter-marginal: Scatter Plot with Marginal Distributions
-Library: altair 6.0.0 | Python 3.13.11
-Quality: 91/100 | Created: 2025-12-26
+Library: altair 6.1.0 | Python 3.13.13
+Quality: 94/100 | Updated: 2026-05-09
 """
 
-import altair as alt
-import numpy as np
-import pandas as pd
+import os
+import sys
+from pathlib import Path
 
 
+current_dir = Path(__file__).parent
+sys.path = [p for p in sys.path if p != str(current_dir)]
+
+import altair as alt  # noqa: E402
+import numpy as np  # noqa: E402
+import pandas as pd  # noqa: E402
+
+
+# Theme tokens
+THEME = os.getenv("ANYPLOT_THEME", "light")
+PAGE_BG = "#FAF8F1" if THEME == "light" else "#1A1A17"
+ELEVATED_BG = "#FFFDF6" if THEME == "light" else "#242420"
+INK = "#1A1A17" if THEME == "light" else "#F0EFE8"
+INK_SOFT = "#4A4A44" if THEME == "light" else "#B8B7B0"
+
+# Okabe-Ito palette
+BRAND = "#009E73"
+
 # Data - bivariate distribution with correlation
 np.random.seed(42)
 n = 150
@@ -21,40 +39,47 @@
 x_domain = [df["X Value"].min() - 2, df["X Value"].max() + 2]
 y_domain = [df["Y Value"].min() - 2, df["Y Value"].max() + 2]
 
-# Interactive brush selection
-brush = alt.param(name="brush", select="interval")
-
 # Base chart
 base = alt.Chart(df)
 
-# Main scatter plot with selection
+# Main scatter plot with grid
 scatter = (
-    base.mark_circle(size=120, opacity=0.65)
+    base.mark_circle(size=120, opacity=0.65, color=BRAND)
     .encode(
         x=alt.X("X Value:Q", title="X Value (units)", scale=alt.Scale(domain=x_domain)),
         y=alt.Y("Y Value:Q", title="Y Value (units)", scale=alt.Scale(domain=y_domain)),
-        color=alt.condition(brush, alt.value("#306998"), alt.value("lightgray")),
         tooltip=["X Value:Q", "Y Value:Q"],
     )
     .properties(width=1000, height=600)
-    .add_params(brush)
 )
 
 # Top marginal histogram with matching X scale
 top_hist = (
-    base.mark_bar(color="#306998", opacity=0.5)
+    base.mark_bar(color=BRAND, opacity=0.5)
     .encode(
-        x=alt.X("X Value:Q", bin=alt.Bin(maxbins=25), title=None, scale=alt.Scale(domain=x_domain), axis=None),
+        x=alt.X(
+            "X Value:Q",
+            bin=alt.Bin(maxbins=25),
+            title=None,
+            scale=alt.Scale(domain=x_domain),
+            axis=alt.Axis(labels=False, ticks=False),
+        ),
         y=alt.Y("count()", title=None, axis=alt.Axis(labels=False, ticks=False)),
     )
     .properties(width=1000, height=120)
 )
 
 # Right marginal histogram with matching Y scale
 right_hist = (
-    base.mark_bar(color="#306998", opacity=0.5)
+    base.mark_bar(color=BRAND, opacity=0.5)
     .encode(
-        y=alt.Y("Y Value:Q", bin=alt.Bin(maxbins=25), title=None, scale=alt.Scale(domain=y_domain), axis=None),
+        y=alt.Y(
+            "Y Value:Q",
+            bin=alt.Bin(maxbins=25),
+            title=None,
+            scale=alt.Scale(domain=y_domain),
+            axis=alt.Axis(labels=False, ticks=False),
+        ),
         x=alt.X("count()", title=None, axis=alt.Axis(labels=False, ticks=False)),
     )
     .properties(width=120, height=600)
@@ -63,13 +88,24 @@
 # Combine: top histogram above, scatter with right histogram below
 combined = (
     alt.vconcat(top_hist, alt.hconcat(scatter, right_hist, spacing=5), spacing=5)
-    .properties(title=alt.Title(text="scatter-marginal · altair · pyplots.ai", fontSize=28, anchor="middle"))
-    .configure_axis(labelFontSize=16, titleFontSize=20)
-    .configure_title(fontSize=28)
-    .configure_view(strokeWidth=0)
+    .properties(
+        background=PAGE_BG,
+        title=alt.Title(text="scatter-marginal · altair · anyplot.ai", fontSize=28, anchor="middle", color=INK),
+    )
+    .configure_axis(
+        domainColor=INK_SOFT,
+        tickColor=INK_SOFT,
+        gridColor=INK,
+        gridOpacity=0.10,
+        labelColor=INK_SOFT,
+        labelFontSize=16,
+        titleColor=INK,
+        titleFontSize=20,
+    )
+    .configure_view(fill=PAGE_BG, stroke=INK_SOFT, strokeWidth=1)
     .configure_concat(spacing=5)
 )
 
 # Save outputs
-combined.save("plot.png", scale_factor=3.0)
-combined.save("plot.html")
+combined.save(f"plot-{THEME}.png", scale_factor=3.0)
+combined.save(f"plot-{THEME}.html")

plots/scatter-marginal/implementations/python/bokeh.py

@@ -1,15 +1,29 @@
-""" pyplots.ai
+""" anyplot.ai
 scatter-marginal: Scatter Plot with Marginal Distributions
-Library: bokeh 3.8.1 | Python 3.13.11
-Quality: 91/100 | Created: 2025-12-26
+Library: bokeh 3.9.0 | Python 3.13.13
+Quality: 90/100 | Updated: 2026-05-09
 """
 
+import os
+import time
+from pathlib import Path
+
 import numpy as np
-from bokeh.io import export_png
+from bokeh.io import output_file, save
 from bokeh.layouts import column, row
 from bokeh.models import ColumnDataSource
 from bokeh.plotting import figure
+from selenium import webdriver
+from selenium.webdriver.chrome.options import Options
+
 
+# Theme tokens
+THEME = os.getenv("ANYPLOT_THEME", "light")
+PAGE_BG = "#FAF8F1" if THEME == "light" else "#1A1A17"
+ELEVATED_BG = "#FFFDF6" if THEME == "light" else "#242420"
+INK = "#1A1A17" if THEME == "light" else "#F0EFE8"
+INK_SOFT = "#4A4A44" if THEME == "light" else "#B8B7B0"
+BRAND = "#009E73"  # Okabe-Ito position 1
 
 # Data - bivariate normal with correlation
 np.random.seed(42)
@@ -19,15 +33,10 @@
 
 source = ColumnDataSource(data={"x": x, "y": y})
 
-# Colors
-python_blue = "#306998"
-python_yellow = "#FFD43B"
-
 # Calculate dimensions for 4800x2700 total with marginal plots
-# Main scatter: ~80% of each dimension, marginals: ~20%
 main_width = 3800
 main_height = 2100
-marginal_width = 3800  # Same as main for alignment
+marginal_width = 3800
 marginal_height = 550
 side_marginal_width = 950
 side_marginal_height = 2100
@@ -41,84 +50,107 @@
 p_scatter = figure(
     width=main_width,
     height=main_height,
-    x_axis_label="X Value",
-    y_axis_label="Y Value",
-    title="scatter-marginal · bokeh · pyplots.ai",
+    x_axis_label="Height (cm)",
+    y_axis_label="Weight (kg)",
+    title="scatter-marginal · bokeh · anyplot.ai",
 )
 
-p_scatter.scatter(x="x", y="y", source=source, size=18, color=python_blue, alpha=0.65, line_color=None)
+p_scatter.scatter(x="x", y="y", source=source, size=20, color=BRAND, alpha=0.65, line_color=None)
 
 # Style main scatter
 p_scatter.title.text_font_size = "28pt"
+p_scatter.title.text_color = INK
 p_scatter.xaxis.axis_label_text_font_size = "22pt"
 p_scatter.yaxis.axis_label_text_font_size = "22pt"
+p_scatter.xaxis.axis_label_text_color = INK
+p_scatter.yaxis.axis_label_text_color = INK
 p_scatter.xaxis.major_label_text_font_size = "18pt"
 p_scatter.yaxis.major_label_text_font_size = "18pt"
-p_scatter.grid.grid_line_alpha = 0.3
-p_scatter.grid.grid_line_dash = [6, 4]
+p_scatter.xaxis.major_label_text_color = INK_SOFT
+p_scatter.yaxis.major_label_text_color = INK_SOFT
+p_scatter.xaxis.axis_line_color = INK_SOFT
+p_scatter.yaxis.axis_line_color = INK_SOFT
+p_scatter.xaxis.major_tick_line_color = INK_SOFT
+p_scatter.yaxis.major_tick_line_color = INK_SOFT
+p_scatter.background_fill_color = PAGE_BG
+p_scatter.border_fill_color = PAGE_BG
+p_scatter.outline_line_color = INK_SOFT
+p_scatter.grid.grid_line_color = INK
+p_scatter.grid.grid_line_alpha = 0.10
+p_scatter.toolbar_location = None
 
 # Top marginal histogram (X distribution)
-p_top = figure(
-    width=main_width,
-    height=marginal_height,
-    x_range=p_scatter.x_range,  # Align with scatter
-    title=None,
-)
-p_top.quad(
-    top=x_hist,
-    bottom=0,
-    left=x_edges[:-1],
-    right=x_edges[1:],
-    fill_color=python_yellow,
-    line_color=python_blue,
-    alpha=0.7,
-)
+p_top = figure(width=marginal_width, height=marginal_height, x_range=p_scatter.x_range, title=None)
+p_top.quad(top=x_hist, bottom=0, left=x_edges[:-1], right=x_edges[1:], fill_color=BRAND, line_color=None, alpha=0.6)
 p_top.xaxis.visible = False
 p_top.yaxis.axis_label = "Count"
 p_top.yaxis.axis_label_text_font_size = "18pt"
+p_top.yaxis.axis_label_text_color = INK
 p_top.yaxis.major_label_text_font_size = "14pt"
-p_top.grid.grid_line_alpha = 0.3
+p_top.yaxis.major_label_text_color = INK_SOFT
+p_top.yaxis.axis_line_color = INK_SOFT
+p_top.yaxis.major_tick_line_color = INK_SOFT
+p_top.background_fill_color = PAGE_BG
+p_top.border_fill_color = PAGE_BG
+p_top.outline_line_color = INK_SOFT
+p_top.grid.grid_line_color = INK
+p_top.grid.grid_line_alpha = 0.10
 p_top.min_border_bottom = 0
 p_top.min_border_left = p_scatter.min_border_left
+p_top.toolbar_location = None
 
 # Right marginal histogram (Y distribution)
-p_right = figure(
-    width=side_marginal_width,
-    height=main_height,
-    y_range=p_scatter.y_range,  # Align with scatter
-    title=None,
-)
-p_right.quad(
-    top=y_edges[1:],
-    bottom=y_edges[:-1],
-    left=0,
-    right=y_hist,
-    fill_color=python_yellow,
-    line_color=python_blue,
-    alpha=0.7,
-)
+p_right = figure(width=side_marginal_width, height=main_height, y_range=p_scatter.y_range, title=None)
+p_right.quad(top=y_edges[1:], bottom=y_edges[:-1], left=0, right=y_hist, fill_color=BRAND, line_color=None, alpha=0.6)
 p_right.yaxis.visible = False
 p_right.xaxis.axis_label = "Count"
 p_right.xaxis.axis_label_text_font_size = "18pt"
+p_right.xaxis.axis_label_text_color = INK
 p_right.xaxis.major_label_text_font_size = "14pt"
-p_right.grid.grid_line_alpha = 0.3
+p_right.xaxis.major_label_text_color = INK_SOFT
+p_right.xaxis.axis_line_color = INK_SOFT
+p_right.xaxis.major_tick_line_color = INK_SOFT
+p_right.background_fill_color = PAGE_BG
+p_right.border_fill_color = PAGE_BG
+p_right.outline_line_color = INK_SOFT
+p_right.grid.grid_line_color = INK
+p_right.grid.grid_line_alpha = 0.10
 p_right.min_border_left = 0
 p_right.min_border_bottom = p_scatter.min_border_bottom
+p_right.toolbar_location = None
 
 # Empty corner placeholder
 p_corner = figure(width=side_marginal_width, height=marginal_height, toolbar_location=None)
 p_corner.outline_line_color = None
 p_corner.xaxis.visible = False
 p_corner.yaxis.visible = False
 p_corner.grid.visible = False
+p_corner.background_fill_color = PAGE_BG
+p_corner.border_fill_color = PAGE_BG
 
-# Remove toolbars for clean look
-p_scatter.toolbar_location = None
-p_top.toolbar_location = None
-p_right.toolbar_location = None
-
-# Layout: top marginal + corner on top row, scatter + right marginal on bottom row
+# Layout
 layout = column(row(p_top, p_corner), row(p_scatter, p_right))
 
-# Save
-export_png(layout, filename="plot.png")
+# Save HTML
+output_file(f"plot-{THEME}.html")
+save(layout)
+
+# Screenshot with Selenium
+W, H = 4800, 2700
+opts = Options()
+for arg in (
+    "--headless=new",
+    "--no-sandbox",
+    "--disable-dev-shm-usage",
+    "--disable-gpu",
+    f"--window-size={W},{H}",
+    "--hide-scrollbars",
+):
+    opts.add_argument(arg)
+
+driver = webdriver.Chrome(options=opts)
+driver.set_window_size(W, H)
+driver.get(f"file://{Path(f'plot-{THEME}.html').resolve()}")
+time.sleep(3)
+driver.save_screenshot(f"plot-{THEME}.png")
+driver.quit()