chore: merge selenium fix

Author: MarkusNeusinger

.github/workflows/ci-plottest.yml

@@ -66,8 +66,8 @@ jobs:
           echo "📦 Installing: uv sync $EXTRAS"
           uv sync $EXTRAS
 
-      - name: Setup Chrome for Highcharts
-        if: steps.detect_libs.outputs.has_plots == 'true' && contains(steps.detect_libs.outputs.libraries, 'highcharts')
+      - name: Setup Chrome for Selenium-based libraries
+        if: steps.detect_libs.outputs.has_plots == 'true' && (contains(steps.detect_libs.outputs.libraries, 'highcharts') || contains(steps.detect_libs.outputs.libraries, 'bokeh'))
         uses: browser-actions/setup-chrome@v1
         with:
           chrome-version: stable

plots/altair/line/line-basic/default.py

@@ -1,166 +1,35 @@
 """
-line-basic: Basic Line Chart
+line-basic: Basic Line Plot
 Library: altair
 """
 
-from typing import TYPE_CHECKING
-
 import altair as alt
 import pandas as pd
 
 
-if TYPE_CHECKING:
-    from altair import Chart
-
-# Style guide colors
-PYTHON_BLUE = "#306998"
-
-
-def create_plot(
-    data: pd.DataFrame,
-    x: str,
-    y: str,
-    title: str | None = None,
-    xlabel: str | None = None,
-    ylabel: str | None = None,
-    color: str = PYTHON_BLUE,
-    linewidth: float = 2,
-    marker: str | None = None,
-    marker_size: int = 60,
-    alpha: float = 1.0,
-    linestyle: str = "solid",
-    **kwargs,
-) -> "Chart":
-    """
-    Create a basic line chart showing trends over a continuous axis.
-
-    Args:
-        data: Input DataFrame with required columns
-        x: Column name for x-axis values (typically time or sequence)
-        y: Column name for y-axis values
-        title: Plot title (default: None)
-        xlabel: Custom x-axis label (default: uses column name)
-        ylabel: Custom y-axis label (default: uses column name)
-        color: Line color (default: Python Blue #306998)
-        linewidth: Width of the line (default: 2)
-        marker: Marker style - 'circle', 'square', 'diamond', etc. (default: None)
-        marker_size: Size of markers if enabled (default: 60)
-        alpha: Transparency level for the line (default: 1.0)
-        linestyle: Line style - 'solid', 'dashed', 'dotted' (default: 'solid')
-        **kwargs: Additional parameters for altair chart configuration
-
-    Returns:
-        Altair Chart object
-
-    Raises:
-        ValueError: If data is empty
-        KeyError: If required columns not found
-
-    Example:
-        >>> data = pd.DataFrame({
-        ...     'month': [1, 2, 3, 4, 5, 6],
-        ...     'sales': [100, 150, 130, 180, 200, 190]
-        ... })
-        >>> chart = create_plot(data, x='month', y='sales')
-    """
-    # Input validation
-    if data.empty:
-        raise ValueError("Data cannot be empty")
-
-    for col in [x, y]:
-        if col not in data.columns:
-            available = ", ".join(data.columns)
-            raise KeyError(f"Column '{col}' not found. Available columns: {available}")
-
-    # Sort data by x-axis to ensure proper line connections
-    plot_data = data.sort_values(by=x).copy()
+# Data
+data = pd.DataFrame({"time": [1, 2, 3, 4, 5, 6, 7], "value": [10, 15, 13, 18, 22, 19, 25]})
 
-    # Determine x encoding type based on data
-    x_dtype = plot_data[x].dtype
-    if pd.api.types.is_datetime64_any_dtype(x_dtype):
-        x_encoding = f"{x}:T"
-    else:
-        x_encoding = f"{x}:Q"
-
-    # Map linestyle to altair strokeDash
-    stroke_dash_map = {"solid": [], "dashed": [8, 4], "dotted": [2, 2]}
-    stroke_dash = stroke_dash_map.get(linestyle, [])
-
-    # Create the line chart
-    line = (
-        alt.Chart(plot_data)
-        .mark_line(color=color, strokeWidth=linewidth, opacity=alpha, strokeDash=stroke_dash)
-        .encode(
-            x=alt.X(
-                x_encoding,
-                title=xlabel or x,
-                axis=alt.Axis(labelAngle=0, labelLimit=200, labelFontSize=16, titleFontSize=20),
-            ),
-            y=alt.Y(
-                f"{y}:Q",
-                title=ylabel or y,
-                scale=alt.Scale(zero=False),
-                axis=alt.Axis(labelFontSize=16, titleFontSize=20),
-            ),
-            tooltip=[
-                alt.Tooltip(x_encoding, title=xlabel or x),
-                alt.Tooltip(f"{y}:Q", title=ylabel or y, format=".2f"),
-            ],
-        )
-    )
-
-    # Add markers if specified
-    if marker:
-        points = (
-            alt.Chart(plot_data)
-            .mark_point(color=color, size=marker_size, filled=True, shape=marker, opacity=alpha)
-            .encode(
-                x=alt.X(x_encoding),
-                y=alt.Y(f"{y}:Q"),
-                tooltip=[
-                    alt.Tooltip(x_encoding, title=xlabel or x),
-                    alt.Tooltip(f"{y}:Q", title=ylabel or y, format=".2f"),
-                ],
-            )
-        )
-        chart_base = line + points
-    else:
-        chart_base = line
-
-    # Apply properties and configuration
-    # Target: 4800 × 2700 px with scale_factor=3.0 -> 1600 × 900 base
-    title_config = alt.TitleParams(text=title, fontSize=20, anchor="middle") if title else None
-    chart = (
-        chart_base.properties(width=1600, height=900, title=title_config)
-        .configure_view(strokeWidth=0)
-        .configure_axis(grid=True, gridOpacity=0.3, gridDash=[3, 3], domainWidth=1, tickWidth=1)
+# Create line chart
+line = (
+    alt.Chart(data)
+    .mark_line(strokeWidth=2, color="#306998")
+    .encode(
+        x=alt.X("time:Q", title="Time", axis=alt.Axis(labelFontSize=16, titleFontSize=20)),
+        y=alt.Y("value:Q", title="Value", axis=alt.Axis(labelFontSize=16, titleFontSize=20)),
     )
+)
 
-    return chart
+# Add points on the line for clarity
+points = alt.Chart(data).mark_point(size=100, color="#306998", filled=True).encode(x="time:Q", y="value:Q")
 
+# Combine and configure chart
+chart = (
+    (line + points)
+    .properties(width=1600, height=900, title=alt.Title("Basic Line Plot", fontSize=20))
+    .configure_view(strokeWidth=0)
+    .configure_axis(grid=True, gridOpacity=0.3)
+)
 
-if __name__ == "__main__":
-    # Sample data for testing - monthly sales trend
-    sample_data = pd.DataFrame(
-        {
-            "Month": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12],
-            "Sales": [120, 150, 170, 165, 180, 220, 250, 240, 210, 190, 180, 200],
-        }
-    )
-
-    # Create plot with markers
-    chart = create_plot(
-        sample_data,
-        x="Month",
-        y="Sales",
-        title="Monthly Sales Trend (2024)",
-        xlabel="Month",
-        ylabel="Sales (thousands)",
-        linewidth=2.5,
-        marker="circle",
-        marker_size=80,
-    )
-
-    # Save as PNG - scale_factor=3.0 gives 4800 × 2700 px
-    chart.save("plot.png", scale_factor=3.0)
-    print("Plot saved to plot.png")
+# Save as PNG (1600 × 900 at scale 3 = 4800 × 2700 px)
+chart.save("plot.png", scale_factor=3.0)

plots/highcharts/line/line-basic/default.py

@@ -3,7 +3,6 @@
 Library: highcharts
 """
 
-import json
 import tempfile
 import time
 import urllib.request
@@ -18,9 +17,9 @@
 
 # Data
 time_values = ["1", "2", "3", "4", "5", "6", "7"]
-values = [10, 15, 13, 18, 22, 19, 25]
+value_data = [10, 15, 13, 18, 22, 19, 25]
 
-# Create chart with container
+# Create chart
 chart = Chart(container="container")
 chart.options = HighchartsOptions()
 
@@ -39,43 +38,38 @@
 # Axes
 chart.options.x_axis = {
     "title": {"text": "Time", "style": {"fontSize": "40px"}},
-    "labels": {"style": {"fontSize": "32px"}, "enabled": True},
     "categories": time_values,
-    "gridLineWidth": 1,
-    "gridLineColor": "#e0e0e0",
+    "labels": {"style": {"fontSize": "32px"}},
     "lineWidth": 2,
     "tickWidth": 2,
 }
 chart.options.y_axis = {
     "title": {"text": "Value", "style": {"fontSize": "40px"}},
     "labels": {"style": {"fontSize": "32px"}},
+    "gridLineWidth": 1,
     "gridLineColor": "#e0e0e0",
-    "lineWidth": 2,
 }
 
-# Legend (not needed for single series)
+# Legend
 chart.options.legend = {"enabled": False}
 
-# Disable credits
-chart.options.credits = {"enabled": False}
-
-# Create and add series
+# Create series
 series = LineSeries()
-series.data = values
+series.data = value_data
 series.name = "Value"
 series.color = "#306998"
-series.marker = {"enabled": True, "radius": 8, "fillColor": "#306998"}
 series.line_width = 4
+series.marker = {"enabled": True, "radius": 8, "fillColor": "#306998"}
 
 chart.add_series(series)
 
-# Download Highcharts JS for inline embedding
+# Download Highcharts JS for headless Chrome
 highcharts_url = "https://code.highcharts.com/highcharts.js"
 with urllib.request.urlopen(highcharts_url, timeout=30) as response:
     highcharts_js = response.read().decode("utf-8")
 
-# Generate HTML with inline scripts using JSON approach for reliability
-opts_json = json.dumps(chart.options.to_dict())
+# Generate HTML with inline scripts
+html_str = chart.to_js_literal()
 html_content = f"""<!DOCTYPE html>
 <html>
 <head>
@@ -84,9 +78,7 @@
 </head>
 <body style="margin:0;">
     <div id="container" style="width: 4800px; height: 2700px;"></div>
-    <script>
-        Highcharts.chart('container', {opts_json});
-    </script>
+    <script>{html_str}</script>
 </body>
 </html>"""
 
@@ -100,15 +92,12 @@
 chrome_options.add_argument("--no-sandbox")
 chrome_options.add_argument("--disable-dev-shm-usage")
 chrome_options.add_argument("--disable-gpu")
-chrome_options.add_argument("--window-size=4800,2800")
+chrome_options.add_argument("--window-size=4800,2700")
 
 driver = webdriver.Chrome(options=chrome_options)
 driver.get(f"file://{temp_path}")
 time.sleep(5)
-
-# Take screenshot of just the chart container element
-container = driver.find_element("id", "container")
-container.screenshot("plot.png")
+driver.save_screenshot("plot.png")
 driver.quit()
 
 Path(temp_path).unlink()

plots/letsplot/line/line-basic/default.py

@@ -7,7 +7,6 @@
 from lets_plot import (
     LetsPlot,
     aes,
-    element_line,
     element_text,
     geom_line,
     geom_point,
@@ -28,17 +27,11 @@
 # Plot
 plot = (
     ggplot(data, aes(x="time", y="value"))
-    + geom_line(color="#306998", size=2, alpha=1.0)
-    + geom_point(color="#306998", size=4, alpha=1.0)
+    + geom_line(color="#306998", size=2)
+    + geom_point(color="#306998", size=4)
     + labs(x="Time", y="Value", title="Basic Line Plot")
     + theme_minimal()
-    + theme(
-        plot_title=element_text(size=20, face="bold"),
-        axis_title=element_text(size=20),
-        axis_text=element_text(size=16),
-        panel_grid_major=element_line(color="#CCCCCC", size=0.5),
-        panel_grid_minor=element_line(color="#EEEEEE", size=0.3),
-    )
+    + theme(plot_title=element_text(size=20), axis_title=element_text(size=20), axis_text=element_text(size=16))
     + ggsize(1600, 900)
 )
 

plots/matplotlib/plot/line-basic/default.py

@@ -10,9 +10,9 @@
 # Data
 data = pd.DataFrame({"time": [1, 2, 3, 4, 5, 6, 7], "value": [10, 15, 13, 18, 22, 19, 25]})
 
-# Plot
+# Create plot
 fig, ax = plt.subplots(figsize=(16, 9))
-ax.plot(data["time"], data["value"], color="#306998", linewidth=2, marker="o", markersize=6)
+ax.plot(data["time"], data["value"], linewidth=2, color="#306998", marker="o", markersize=8)
 
 # Labels and styling
 ax.set_xlabel("Time", fontsize=20)