include new static export in plotly crate

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

Author: andrei-ng

plotly/Cargo.toml

@@ -2,7 +2,7 @@
 name = "plotly"
 version = "0.12.1"
 description = "A plotting library powered by Plotly.js"
-authors = ["Ioannis Giagkiozis <[email protected]>"]
+authors = ["Ioannis Giagkiozis <[email protected]>", "Andrei Gherghescu <[email protected]>"]
 license = "MIT"
 readme = "../README.md"
 homepage = "https://github.com/plotly/plotly.rs"
@@ -17,6 +17,11 @@ exclude = ["target/*"]
 kaleido = ["plotly_kaleido"]
 kaleido_download = ["plotly_kaleido/download"]
 
+plotly_static = []
+plotly_static_download = ["plotly_static/download"]
+plotly_static_chromedriver = ["plotly_static/chromedriver"]
+plotly_static_geckodriver = ["plotly_static/geckodriver"]
+
 plotly_ndarray = ["ndarray"]
 plotly_image = ["image"]
 plotly_embed_js = []
@@ -27,6 +32,7 @@ dyn-clone = "1"
 erased-serde = "0.4"
 image = { version = "0.25", optional = true }
 plotly_derive = { version = "0.12", path = "../plotly_derive" }
+plotly_static = { version = "0.0.1", path = "../plotly_static", optional = true }
 plotly_kaleido = { version = "0.12", path = "../plotly_kaleido", optional = true }
 ndarray = { version = "0.16", optional = true }
 once_cell = "1"
@@ -53,6 +59,6 @@ image = "0.25"
 itertools = ">=0.10, <0.15"
 itertools-num = "0.1"
 ndarray = "0.16"
-plotly_kaleido = { path = "../plotly_kaleido", features = ["download"] }
+plotly_static = { path = "../plotly_static", features = ["download", "chromedriver"], default-features = false }
 rand_distr = "0.5"
 base64 = "0.22"

plotly/src/lib.rs

@@ -33,10 +33,15 @@ pub use common::color;
 pub use configuration::Configuration;
 pub use layout::Layout;
 pub use plot::{Plot, Trace};
+
 #[cfg(feature = "kaleido")]
 pub use static_format::ImageFormat;
 #[cfg(not(feature = "kaleido"))]
 pub use static_format::ImageFormat;
+
+#[cfg(feature = "plotly_static")]
+pub use plotly_static::{StaticExporterBuilder, ImageFormat};
+
 // Also provide easy access to modules which contain additional trace-specific types
 pub use traces::{
     box_plot, contour, heat_map, histogram, image, mesh3d, sankey, scatter, scatter3d,

plotly_static/Cargo.toml

@@ -13,7 +13,7 @@ keywords = ["plot", "static", "image", "export", "chart", "plotly", "ndarray"]
 exclude = ["target/*"]
 
 [features]
-default = ["download"]
+# default = ["download", "chromedriver"]
 download = []
 geckodriver = []
 chromedriver = []

plotly_static/build.rs

@@ -8,17 +8,22 @@ use anyhow::{anyhow, Context, Result};
 use tokio::time::sleep;
 use webdriver_downloader::prelude::*;
 
-#[cfg(target_os = "windows")]
-const DRIVER_EXT: &str = ".exe";
-#[cfg(not(target_os = "windows"))]
-const DRIVER_EXT: &str = "";
+// Enforce that only one driver feature is enabled
+#[cfg(all(feature = "geckodriver", feature = "chromedriver"))]
+compile_error!("Only one of 'geckodriver' or 'chromedriver' features can be enabled at a time.");
 
+// Define the WEBDRIVER_BIN constant based on the enabled feature
 #[cfg(feature = "geckodriver")]
 const WEBDRIVER_BIN: &str = "geckodriver";
 
 #[cfg(feature = "chromedriver")]
 const WEBDRIVER_BIN: &str = "chromedriver";
 
+#[cfg(target_os = "windows")]
+const DRIVER_EXT: &str = ".exe";
+#[cfg(not(target_os = "windows"))]
+const DRIVER_EXT: &str = "";
+
 const CHROME_PATH_ENV: &str = "CHROME_PATH";
 const CHROMEDRIVER_PATH_ENV: &str = "CHROMEDRIVER_PATH";
 const FIREFOX_PATH_ENV: &str = "FIREFOX_PATH";

plotly_static/examples/main.rs

@@ -1,5 +1,5 @@
 use clap::{Parser, ValueEnum};
-use plotly_static::{ImageFormat, StaticlyBuilder};
+use plotly_static::{ImageFormat, StaticExporterBuilder};
 use serde_json::Value;
 use std::fs;
 use std::io::{self, Read};
@@ -109,8 +109,8 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         return Err("Invalid JSON: expected an object".into());
     }
 
-    // Build Staticly instance
-    let mut staticly = StaticlyBuilder::default()
+    // Build StaticExporter instance
+    let mut exporter = StaticExporterBuilder::default()
         .offline_mode(cli.offline)
         .build()?;
 
@@ -123,7 +123,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     );
 
     // Export the plot
-    staticly.write_fig(
+    exporter.write_fig(
         &cli.output,
         &plot_json,
         cli.format.into(),