fix examples ci for static export

Signed-off-by: Andrei Gherghescu <[email protected]>

Author: andrei-ng

examples/Cargo.toml

@@ -15,6 +15,7 @@ members = [
     "scientific_charts",
     "shapes",
     "statistical_charts",
+    "static_export",
     "subplots",
     "themes"
 ]

examples/customization/consistent_static_format_export/Cargo.toml

@@ -6,4 +6,6 @@ authors = ["Yuriy D. Sibirmovsky"]
 description = "This example demonstrates exporting a plot to SVG, PNG, and PDF and keeping the font size consistent across all formats."
 
 [dependencies]
-plotly = { path = "../../../plotly", features = ["kaleido", "kaleido_download"] } 
+plotly = { path = "../../../plotly", features = ["static_export_default"] }
+env_logger = "0.10"
+log = "0.4"

examples/customization/consistent_static_format_export/src/main.rs

@@ -1,14 +1,16 @@
+use log::info;
 use plotly::color::{NamedColor, Rgb};
 use plotly::common::{Anchor, Font, Line, Marker, MarkerSymbol, Mode, Title};
 use plotly::layout::{Axis, ItemSizing, Legend, Margin, Shape, ShapeLine, ShapeType};
-use plotly::{ImageFormat, Layout, Plot, Scatter};
+use plotly::plotly_static::{ImageFormat, StaticExporterBuilder};
+use plotly::{Layout, Plot, Scatter};
 
 fn line_and_scatter_plot(
     x1: Vec<f64>,
     y1: Vec<f64>,
     x2: Vec<f64>,
     y2: Vec<f64>,
-    flnm: &str,
+    file_name: &str,
     title: &str,
 ) {
     let bgcol = Rgb::new(255, 255, 255);
@@ -140,18 +142,26 @@ fn line_and_scatter_plot(
     plot.add_trace(trace2);
     plot.set_layout(layout);
 
-    // Export to multiple formats to demonstrate the SVG export issue
-    println!("Exporting plot to multiple formats...");
-    println!("Note: SVG export may have font sizing issues compared to PNG/PDF");
-
-    plot.write_image(flnm, ImageFormat::PDF, 1280, 960, 1.0);
-    plot.write_image(flnm, ImageFormat::SVG, 1280, 960, 1.0);
-    plot.write_image(flnm, ImageFormat::PNG, 1280, 960, 1.0);
-
-    println!("Export complete. Check the output files:");
-    println!("  - {flnm}.pdf");
-    println!("  - {flnm}.svg");
-    println!("  - {flnm}.png");
+    let mut exporter = StaticExporterBuilder::default()
+        .spawn_webdriver(true)
+        .webdriver_port(4444)
+        .build()
+        .unwrap();
+
+    info!("Exporting to PNG format...");
+    plot.write_image_with_exporter(&mut exporter, file_name, ImageFormat::PNG, 1280, 960, 1.0)
+        .unwrap();
+    info!("Exporting to SVG format...");
+    plot.write_image_with_exporter(&mut exporter, file_name, ImageFormat::SVG, 1280, 960, 1.0)
+        .unwrap();
+    info!("Exporting to PDF format...");
+    plot.write_image_with_exporter(&mut exporter, file_name, ImageFormat::PDF, 1280, 960, 1.0)
+        .unwrap();
+
+    info!("Export complete. Check the output files:");
+    info!("  - {file_name}.pdf");
+    info!("  - {file_name}.svg");
+    info!("  - {file_name}.png");
 }
 
 fn read_from_file(file_path: &str) -> Vec<Vec<f64>> {
@@ -204,6 +214,8 @@ fn read_from_file(file_path: &str) -> Vec<Vec<f64>> {
 }
 
 fn main() {
+    env_logger::Builder::from_env(env_logger::Env::default().default_filter_or("info")).init();
+
     let data = read_from_file("assets/data_file.dat");
     let x1 = data[0].clone();
     let y1 = data[1].clone();

examples/kaleido/src/main.rs

@@ -16,6 +16,7 @@ fn main() {
 
     // The image will be saved to format!("output/image.{image_format}") relative to
     // the current working directory.
+    #[allow(deprecated)]
     plot.write_image(&filename, ImageFormat::EPS, width, height, scale);
     plot.write_image(&filename, ImageFormat::JPEG, width, height, scale);
     plot.write_image(&filename, ImageFormat::PDF, width, height, scale);

plotly/Cargo.toml

@@ -38,7 +38,7 @@ erased-serde = "0.4"
 image = { version = "0.25", optional = true }
 plotly_derive = { version = "0.13", path = "../plotly_derive" }
 plotly_static = { version = "0.0.1", path = "../plotly_static", optional = true }
-plotly_kaleido = { version = "0.12", path = "../plotly_kaleido", optional = true }
+plotly_kaleido = { version = "0.13", path = "../plotly_kaleido", optional = true }
 ndarray = { version = "0.16", optional = true }
 once_cell = "1"
 serde = { version = "1.0", features = ["derive"] }

plotly_kaleido/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "plotly_kaleido"
-version = "0.12.2"
+version = "0.13.0"
 description = "Additional output format support for plotly using Kaleido"
 authors = [
     "Ioannis Giagkiozis <[email protected]>",

plotly_kaleido/src/lib.rs

@@ -26,6 +26,7 @@ use serde_json::Value;
 /// This enum defines all the image formats that can be exported from Plotly
 /// plots using the Kaleido engine. Kaleido supports all these formats natively.
 #[derive(Debug, Clone)]
+#[allow(deprecated)]
 pub enum ImageFormat {
     /// Portable Network Graphics format
     PNG,
@@ -37,7 +38,15 @@ pub enum ImageFormat {
     SVG,
     /// Portable Document Format
     PDF,
-    /// Encapsulated PostScript format
+    /// Encapsulated PostScript format (deprecated)
+    ///
+    /// This format is deprecated since version 0.13.0 and will be removed in
+    /// version 0.14.0. Use SVG or PDF instead for vector graphics. EPS is
+    /// not supported in the open source version.
+    #[deprecated(
+        since = "0.13.0",
+        note = "Use SVG or PDF instead. EPS variant will be removed in version 0.14.0"
+    )]
     EPS,
 }
 
@@ -64,6 +73,7 @@ impl std::fmt::Display for ImageFormat {
                 Self::WEBP => "webp",
                 Self::SVG => "svg",
                 Self::PDF => "pdf",
+                #[allow(deprecated)]
                 Self::EPS => "eps",
             }
         )
@@ -208,6 +218,7 @@ impl Kaleido {
         dst.set_extension(format.to_string());
 
         let image_data = self.convert(plotly_data, format.clone(), width, height, scale)?;
+        #[allow(deprecated)]
         let data = match format {
             ImageFormat::SVG | ImageFormat::EPS => image_data.as_bytes(),
             _ => &general_purpose::STANDARD.decode(image_data).unwrap(),
@@ -460,6 +471,7 @@ mod tests {
         let test_plot = create_test_plot();
         let k = Kaleido::new();
         let dst = PathBuf::from("example.eps");
+        #[allow(deprecated)]
         let r = k.save(dst.as_path(), &test_plot, ImageFormat::EPS, 1200, 900, 4.5);
         assert!(r.is_ok());
         assert!(std::fs::remove_file(dst.as_path()).is_ok());

plotly_static/src/lib.rs

@@ -198,6 +198,8 @@
 //!   sessions
 //!
 //! ### WebDriver Configuration
+
+#![allow(deprecated)]
 //!
 //! Set the `WEBDRIVER_PATH` environment variable to specify a custom WebDriver
 //! binary location (should point to the full executable path):