seraplot 2.3.76__tar.gz → 2.3.77__tar.gz

{seraplot-2.3.76 → seraplot-2.3.77}/Cargo.lock

@@ -3471,7 +3471,7 @@ checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd"
 
 [[package]]
 name = "seraplot"
-version = "2.3.76"
+version = "2.3.77"
 dependencies = [
  "base64 0.22.1",
  "criterion",

{seraplot-2.3.76 → seraplot-2.3.77}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "seraplot"
-version = "2.3.76"
+version = "2.3.77"
 edition = "2021"
 authors = ["feur25"]
 description = "Rust data visualization framework - The modern Plotly alternative"

{seraplot-2.3.76 → seraplot-2.3.77}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: seraplot
-Version: 2.3.76
+Version: 2.3.77
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Win32 (MS Windows)
 Classifier: Intended Audience :: Developers

{seraplot-2.3.76 → seraplot-2.3.77}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "seraplot"
-version = "2.3.76"
+version = "2.3.77"
 description = "Rust data visualization framework - The modern Plotly alternative"
 readme = "README.md"
 readme-content-type = "text/markdown"

{seraplot-2.3.76 → seraplot-2.3.77}/src/bindings/commands/charts.rs

@@ -1258,6 +1258,47 @@ pub fn build_parallel(input: &str) -> String {
     apply(html, &o)
 }
 
+pub fn plot_chart(input: &str) -> String {
+    #[derive(Deserialize, Default)]
+    struct I {
+        x: Option<Vec<f64>>,
+        y: Option<Vec<f64>>,
+        kind: Option<String>,
+        title: Option<String>,
+        color_hex: Option<u32>,
+        width: Option<i32>,
+        height: Option<i32>,
+        x_label: Option<String>,
+        y_label: Option<String>,
+        gridlines: Option<bool>,
+        palette: Option<Vec<u32>>,
+        background: Option<String>,
+        show_points: Option<bool>,
+    }
+    let p: I = serde_json::from_str(input).unwrap_or_default();
+    let xv = p.x.unwrap_or_default();
+    let title = p.title.unwrap_or_default();
+    let color_hex = p.color_hex.unwrap_or(0x6366F1);
+    let width = p.width.unwrap_or(900);
+    let height = p.height.unwrap_or(480);
+    let x_label = p.x_label.unwrap_or_default();
+    let y_label = p.y_label.unwrap_or_default();
+    let gridlines = p.gridlines.unwrap_or(false);
+    let show_points = p.show_points.unwrap_or(true);
+    let kind = p.kind.as_deref().unwrap_or("line");
+    if let Some(yv) = p.y {
+        if kind == "scatter" {
+            build_scatter_chart(&serde_json::json!({"title":title,"x":xv,"y":yv,"color_hex":color_hex,"width":width,"height":height,"x_label":x_label,"y_label":y_label,"gridlines":gridlines,"palette":p.palette,"background":p.background}).to_string())
+        } else {
+            let labels: Vec<String> = xv.iter().map(|v| v.to_string()).collect();
+            build_line_chart(&serde_json::json!({"title":title,"labels":labels,"values":yv,"color_hex":color_hex,"show_points":show_points,"width":width,"height":height,"x_label":x_label,"y_label":y_label,"gridlines":gridlines,"palette":p.palette,"background":p.background}).to_string())
+        }
+    } else {
+        let labels: Vec<String> = (0..xv.len()).map(|idx| idx.to_string()).collect();
+        build_line_chart(&serde_json::json!({"title":title,"labels":labels,"values":xv,"color_hex":color_hex,"show_points":show_points,"width":width,"height":height,"x_label":x_label,"y_label":y_label,"gridlines":gridlines,"palette":p.palette,"background":p.background}).to_string())
+    }
+}
+
 pub fn build_grid(input: &str) -> String {
     let (title_s, a, o) = parse_all(input);
     let title = title_s.as_str();

{seraplot-2.3.76 → seraplot-2.3.77}/src/bindings/commands/native.rs

@@ -309,35 +309,18 @@ pub fn build_slideshow(
 
 #[cfg(feature = "python")]
 #[pyfunction]
+#[pyo3(signature = (labels, images=None, descriptions=None))]
 pub fn build_hover_json(
     labels: Vec<String>,
     images: Option<Vec<Option<String>>>,
-    descriptions: Option<&PyAny>,
-) -> PyResult<String> {
-    use crate::html::hover::{HoverSlot, slots_to_json};
-    let mut slots = Vec::new();
-    let n = labels.len();
-    for i in 0..n {
-        let mut slot = HoverSlot::new(&labels.get(i).cloned().unwrap_or_default());
-        if let Some(ref imgs) = images {
-            if i < imgs.len() {
-                if let Some(ref img_url) = imgs[i] {
-                    slot = slot.image(img_url.clone());
-                }
-            }
-        }
-        if let Some(descs_py) = descriptions {
-            if let Ok(descs_list) = descs_py.extract::<Vec<Vec<(String, String)>>>() {
-                if i < descs_list.len() {
-                    for (k, v) in &descs_list[i] {
-                        slot = slot.kv(k.clone(), v.clone());
-                    }
-                }
-            }
-        }
-        slots.push(slot);
-    }
-    Ok(slots_to_json(&slots))
+    descriptions: Option<Vec<Vec<(String, String)>>>,
+) -> String {
+    let desc_json: Option<Vec<Vec<Vec<String>>>> = descriptions.map(|outer|
+        outer.into_iter().map(|row| row.into_iter().map(|(k, v)| vec![k, v]).collect()).collect()
+    );
+    crate::bindings::commands::charts::build_hover_json(
+        &serde_json::json!({"labels": labels, "images": images, "descriptions": desc_json}).to_string()
+    )
 }
 
 #[cfg(feature = "python")]
@@ -361,42 +344,28 @@ pub fn plot_chart(
 ) -> PyResult<Chart> {
     let (bg, pal, grid) = crate::merge_global_opts(background, palette, gridlines);
     let pal_opt: Option<Vec<u32>> = if pal.is_empty() { None } else { Some(pal) };
-
-    if let Ok(df) = x.getattr("columns") {
-        let cols: Vec<String> = df.extract()?;
+    if let Ok(cols_obj) = x.getattr("columns") {
+        let cols: Vec<String> = cols_obj.extract()?;
         if cols.len() >= 2 {
             let xv = crate::py_to_f64_vec(py, x.get_item(&cols[0])?)?;
             let yv = crate::py_to_f64_vec(py, x.get_item(&cols[1])?)?;
-            let auto_title = if title.is_empty() { format!("{} vs {}", cols[0], cols[1]) } else { String::new() };
-            let t = if title.is_empty() { auto_title.as_str() } else { title };
-            let html = crate::bindings::commands::charts::build_scatter_chart(
-                &serde_json::json!({"title":t,"x":xv,"y":yv,"color_hex":color_hex,"width":width,"height":height,"x_label":x_label,"y_label":y_label,"gridlines":grid,"palette":pal_opt,"background":bg}).to_string()
-            );
-            return Ok(Chart::new_doc(html, ""));
+            let auto_title = if title.is_empty() { format!("{} vs {}", cols[0], cols[1]) } else { title.to_string() };
+            return Ok(Chart::new_doc(
+                crate::bindings::commands::charts::plot_chart(
+                    &serde_json::json!({"x":xv,"y":yv,"kind":"scatter","title":auto_title,"color_hex":color_hex,"width":width,"height":height,"x_label":x_label,"y_label":y_label,"gridlines":grid,"palette":pal_opt,"background":bg}).to_string()
+                ),
+                "",
+            ));
         }
     }
-
     let xv = crate::py_to_f64_vec(py, x)?;
-    if let Some(yobj) = y {
-        let yv = crate::py_to_f64_vec(py, yobj)?;
-        let html = if kind == "scatter" {
-            crate::bindings::commands::charts::build_scatter_chart(
-                &serde_json::json!({"title":title,"x":xv,"y":yv,"color_hex":color_hex,"width":width,"height":height,"x_label":x_label,"y_label":y_label,"gridlines":grid,"palette":pal_opt,"background":bg}).to_string()
-            )
-        } else {
-            let labels: Vec<String> = xv.iter().map(|v| v.to_string()).collect();
-            crate::bindings::commands::charts::build_line_chart(
-                &serde_json::json!({"title":title,"labels":labels,"values":yv,"color_hex":color_hex,"show_points":show_points,"width":width,"height":height,"x_label":x_label,"y_label":y_label,"gridlines":grid,"palette":pal_opt,"background":bg}).to_string()
-            )
-        };
-        Ok(Chart::new_doc(html, ""))
-    } else {
-        let labels: Vec<String> = (0..xv.len()).map(|i| i.to_string()).collect();
-        let html = crate::bindings::commands::charts::build_line_chart(
-            &serde_json::json!({"title":title,"labels":labels,"values":xv,"color_hex":color_hex,"show_points":show_points,"width":width,"height":height,"x_label":x_label,"y_label":y_label,"gridlines":grid,"palette":pal_opt,"background":bg}).to_string()
-        );
-        Ok(Chart::new_doc(html, ""))
-    }
+    let yv: Option<Vec<f64>> = if let Some(yobj) = y { Some(crate::py_to_f64_vec(py, yobj)?) } else { None };
+    Ok(Chart::new_doc(
+        crate::bindings::commands::charts::plot_chart(
+            &serde_json::json!({"x":xv,"y":yv,"kind":kind,"title":title,"color_hex":color_hex,"show_points":show_points,"width":width,"height":height,"x_label":x_label,"y_label":y_label,"gridlines":grid,"palette":pal_opt,"background":bg}).to_string()
+        ),
+        "",
+    ))
 }
 
 #[cfg(feature = "python")]

{seraplot-2.3.76 → seraplot-2.3.77}/src/bindings/registry_macro.rs

@@ -172,6 +172,7 @@ macro_rules! for_each_ml_oneshot_fn {
 macro_rules! for_each_fn {
     ($mac:ident) => {
         $crate::for_each_chart_fn!($mac);
+        $mac!(plot_chart,                "plotChart");
         $mac!(build_hover_json,          "buildHoverJson");
         $crate::for_each_ml_oneshot_fn!($mac);
         $mac!(set_theme,                 "setTheme");

seraplot-2.3.76/test_universal_ml.js

@@ -1,58 +0,0 @@
-#!/usr/bin/env node
-const { execFileSync } = require("child_process");
-const path = require("path");
-
-const PY = process.env.SERAPLOT_PY || "C:\\Users\\Quentin\\Desktop\\SeraPlot\\.venv\\Scripts\\python.exe";
-
-function call(fnName, payload) {
-  const code =
-    "import json,sys,seraplot._seraplot as s\n" +
-    "fn=getattr(s,'" + fnName + "')\n" +
-    "print(fn(sys.stdin.read()))\n";
-  const json = JSON.stringify(payload);
-  const out = execFileSync(PY, ["-c", code], { input: json, encoding: "utf8" });
-  return JSON.parse(out.trim());
-}
-
-const X_train = [
-  [1, 2], [2, 3], [3, 4], [4, 5], [5, 6],
-  [1, 1], [2, 2], [3, 3], [4, 4], [5, 5],
-];
-const y_reg = [3, 5, 7, 9, 11, 2, 4, 6, 8, 10];
-const y_cls = [0, 0, 1, 1, 1, 0, 0, 1, 1, 1];
-const X_test = [[6, 7], [3, 3]];
-
-const cases = [
-  ["mlLinearRegression",            { x_train: X_train, y_train: y_reg, x_test: X_test, fit_intercept: true }],
-  ["mlRidge",                       { x_train: X_train, y_train: y_reg, x_test: X_test, alpha: 0.5 }],
-  ["mlLasso",                       { x_train: X_train, y_train: y_reg, x_test: X_test, alpha: 0.1 }],
-  ["mlElasticNet",                  { x_train: X_train, y_train: y_reg, x_test: X_test, alpha: 0.1, l1_ratio: 0.5 }],
-  ["mlLogisticRegression",          { x_train: X_train, y_train: y_cls, x_test: X_test, c: 1.0, max_iter: 200 }],
-  ["mlDecisionTreeClassifier",      { x_train: X_train, y_train: y_cls, x_test: X_test, max_depth: 5 }],
-  ["mlDecisionTreeRegressor",       { x_train: X_train, y_train: y_reg, x_test: X_test, max_depth: 5 }],
-  ["mlRandomForestClassifier",      { x_train: X_train, y_train: y_cls, x_test: X_test, n_estimators: 10, max_depth: 5, max_features: "sqrt" }],
-  ["mlRandomForestRegressor",       { x_train: X_train, y_train: y_reg, x_test: X_test, n_estimators: 10, max_depth: 5, max_features: "sqrt" }],
-  ["mlGradientBoostingClassifier",  { x_train: X_train, y_train: y_cls, x_test: X_test, n_estimators: 20, learning_rate: 0.1, max_depth: 3 }],
-  ["mlGradientBoostingRegressor",   { x_train: X_train, y_train: y_reg, x_test: X_test, n_estimators: 20, learning_rate: 0.1, max_depth: 3 }],
-  ["mlKnnClassifier",               { x_train: X_train, y_train: y_cls, x_test: X_test, k: 3, weights: "uniform" }],
-  ["mlKnnRegressor",                { x_train: X_train, y_train: y_reg, x_test: X_test, k: 3, weights: "distance" }],
-  ["mlKmeansFitPredict",            { x: X_train, k: 2, max_iter: 100 }],
-  ["mlDbscanFitPredict",            { x: X_train, eps: 1.5, min_samples: 2 }],
-];
-
-let ok = 0, ko = 0;
-for (const [name, payload] of cases) {
-  try {
-    const r = call(name, payload);
-    const pv = r.predictions || r.labels || r;
-    const head = Array.isArray(pv) ? pv.slice(0, 5) : pv;
-    console.log("[OK]   " + name.padEnd(32) + " -> " + JSON.stringify(head));
-    ok++;
-  } catch (e) {
-    console.log("[FAIL] " + name + " -> " + (e.message || e).split("\n")[0]);
-    ko++;
-  }
-}
-
-console.log("\n=== " + ok + " ok / " + ko + " ko ===");
-process.exit(ko === 0 ? 0 : 1);