Fix serialization

Author: stijnherfst

Cargo.toml

@@ -15,18 +15,18 @@ polars-arrow = { version = "0.48.0", default-features = false }
 polars-ffi = { version = "0.48.0", default-features = false }
 polars-plan = { version = "0.48.0", default-features = false }
 polars-lazy = { version = "0.48.0", default-features = false }
-polars-python = {version = "0.48.0", default-features = false }
-polars-utils = {version = "0.48.0", default-features = false}
+polars-python = { version = "0.48.0", default-features = false }
+polars-utils = { version = "0.48.0", default-features = false }
 
 [workspace.dependencies.arrow]
 package = "polars-arrow"
 version = "0.48.0"
 path = "../polars/crates/polars-arrow"
 default-features = false
 
-#[patch.crates-io]
-#polars = { git = "https://github.com/pola-rs/polars.git" }
-#polars-core = { git = "https://github.com/pola-rs/polars.git" }
-#polars-ffi = { git = "https://github.com/pola-rs/polars.git" }
-#polars-plan = { git = "https://github.com/pola-rs/polars.git" }
-#polars-lazy = { git = "https://github.com/pola-rs/polars.git" }
+# [patch.crates-io]
+# polars = { git = "https://github.com/pola-rs/polars.git" }
+# polars-core = { git = "https://github.com/pola-rs/polars.git" }
+# polars-ffi = { git = "https://github.com/pola-rs/polars.git" }
+# polars-plan = { git = "https://github.com/pola-rs/polars.git" }
+# polars-lazy = { git = "https://github.com/pola-rs/polars.git" }

example/derive_expression/expression_lib/Cargo.toml

@@ -9,10 +9,10 @@ name = "expression_lib"
 crate-type = ["cdylib"]
 
 [dependencies]
+num = "*"
 polars = { workspace = true, features = ["fmt", "dtype-date", "timezones"], default-features = false }
 polars-arrow = { workspace = true, default-features = false }
 pyo3 = { version = "0.24.2", features = ["abi3-py38"] }
 pyo3-polars = { version = "*", path = "../../../pyo3-polars", features = ["derive"] }
 rayon = "1.7.0"
 serde = { version = "1", features = ["derive"] }
-num = "*"

pyo3-polars-derive/Cargo.toml

@@ -17,14 +17,14 @@ name = "tests"
 path = "tests/run.rs"
 
 [dependencies]
+polars-arrow = { workspace = true }
 polars-core = { workspace = true }
 polars-ffi = { workspace = true }
 polars-plan = { workspace = true }
-polars-arrow = { workspace = true }
 proc-macro2 = "1.0"
 quote = "1.0"
 syn = { version = "2", features = ["full", "extra-traits"] }
 
 [dev-dependencies]
+pyo3-polars = { version = "0.21.0", path = "../pyo3-polars", features = ["derive"] }
 trybuild = { version = "1", features = ["diff"] }
-pyo3-polars = { version = "0.21.0", path = "../pyo3-polars", features = ["derive"] }

pyo3-polars/Cargo.toml

@@ -12,13 +12,13 @@ description = "Expression plugins and PyO3 types for polars"
 [dependencies]
 libc = "0.2" # pyo3 depends on libc already, so this does not introduce an extra dependence.
 once_cell = "1"
-polars = { workspace = true, default-features = true}
+polars = { workspace = true, default-features = true }
 polars-arrow = { workspace = true, default-features = false }
 polars-core = { workspace = true, default-features = false }
 polars-ffi = { workspace = true, optional = true }
 polars-lazy = { workspace = true, optional = true }
 polars-plan = { workspace = true, optional = true }
-polars-utils = {workspace = true, features = ["serde"], optional = true }
+polars-utils = { workspace = true, features = ["serde"], optional = true }
 pyo3 = "0.24.2"
 pyo3-polars-derive = { version = "0.15.0", path = "../pyo3-polars-derive", optional = true }
 serde = { version = "1", optional = true }

pyo3-polars/src/types.rs

@@ -220,13 +220,11 @@ impl<'a> FromPyObject<'a> for PyLazyFrame {
         let b = s.extract::<Bound<'_, PyBytes>>()?;
         let b = b.as_bytes();
 
-        let lp: DslPlan = pl_serialize::SerializeOptions::default()
-            .deserialize_from_reader::<DslPlan, &[u8], false>(&*b)
-            .map_err(
+        let lp = DslPlan::deserialize_versioned(b).map_err(
             |e| PyPolarsErr::Other(
-                format!("Error when deserializing LazyFrame. This may be due to mismatched polars versions. {}", e)
-            )
-        )?;
+                format!("Error when deserializing LazyFrame. This may be due to mismatched polars versions. {e}")
+            ))
+            ?;
 
         Ok(PyLazyFrame(LazyFrame::from(lp)))
     }
@@ -241,7 +239,7 @@ impl<'a> FromPyObject<'a> for PyExpr {
             .deserialize_from_reader::<Expr, &[u8], false>(&*s)
             .map_err(
             |e| PyPolarsErr::Other(
-                format!("Error when deserializing 'Expr'. This may be due to mismatched polars versions. {}", e)
+                format!("Error when deserializing 'Expr'. This may be due to mismatched polars versions. {e}")
             )
         )?;
 
@@ -358,10 +356,9 @@ impl<'py> IntoPyObject<'py> for PyLazyFrame {
         let cls = polars.getattr("LazyFrame")?;
         let instance = cls.call_method1(intern!(py, "__new__"), (&cls,)).unwrap();
 
-        let buf = pl_serialize::SerializeOptions::default()
-            .serialize_to_bytes::<DslPlan, false>(&self.0.logical_plan)
-            .unwrap();
-        instance.call_method1("__setstate__", (&buf,))?;
+        let mut v = vec![];
+        self.0.logical_plan.serialize_versioned(&mut v).unwrap();
+        instance.call_method1("__setstate__", (&v,))?;
         Ok(instance)
     }
 }