Upgrade pyo3 to 0.23

dottxt-ai · Feb 10, 2025 · 33d6deb · 33d6deb
1 parent 2dfb1dd
commit 33d6deb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -10,9 +10,9 @@ rust-version = "1.71.1"
 [dependencies]
 once_cell = "1.20"
 thiserror = "2.0"
-pyo3 = { version = "0.22.0", features = ["extension-module"], optional = true }
+pyo3 = { version = "0.23", features = ["extension-module"], optional = true }
 regex = "1.10.6"
-serde-pyobject = { version = "0.4.0", optional = true }
+serde-pyobject = { version = "0.5.0", optional = true }
 serde_json = { version = "1.0", features = ["preserve_order"] }
 serde = {version = "1.0", features = ["derive"]}
 bincode = "2.0.0-rc.3"

diff --git a/src/python_bindings/mod.rs b/src/python_bindings/mod.rs
@@ -90,13 +90,12 @@ impl PyGuide {
 
     fn __reduce__(&self) -> PyResult<(PyObject, (Vec<u8>,))> {
         Python::with_gil(|py| {
-            let cls =
-                PyModule::import_bound(py, "outlines_core.outlines_core_rs")?.getattr("Guide")?;
+            let cls = PyModule::import(py, "outlines_core.outlines_core_rs")?.getattr("Guide")?;
             let binary_data: Vec<u8> =
                 bincode::encode_to_vec(self, config::standard()).map_err(|e| {
                     PyErr::new::<PyValueError, _>(format!("Serialization of Guide failed: {}", e))
                 })?;
-            Ok((cls.getattr("from_binary")?.to_object(py), (binary_data,)))
+            Ok((cls.getattr("from_binary")?.unbind(), (binary_data,)))
         })
     }
 
@@ -167,13 +166,12 @@ impl PyIndex {
 
     fn __reduce__(&self) -> PyResult<(PyObject, (Vec<u8>,))> {
         Python::with_gil(|py| {
-            let cls =
-                PyModule::import_bound(py, "outlines_core.outlines_core_rs")?.getattr("Index")?;
+            let cls = PyModule::import(py, "outlines_core.outlines_core_rs")?.getattr("Index")?;
             let binary_data: Vec<u8> = bincode::encode_to_vec(&self.0, config::standard())
                 .map_err(|e| {
                     PyErr::new::<PyValueError, _>(format!("Serialization of Index failed: {}", e))
                 })?;
-            Ok((cls.getattr("from_binary")?.to_object(py), (binary_data,)))
+            Ok((cls.getattr("from_binary")?.unbind(), (binary_data,)))
         })
     }
 
@@ -300,16 +298,16 @@ impl PyVocabulary {
 
     fn __reduce__(&self) -> PyResult<(PyObject, (Vec<u8>,))> {
         Python::with_gil(|py| {
-            let cls = PyModule::import_bound(py, "outlines_core.outlines_core_rs")?
-                .getattr("Vocabulary")?;
+            let cls =
+                PyModule::import(py, "outlines_core.outlines_core_rs")?.getattr("Vocabulary")?;
             let binary_data: Vec<u8> =
                 bincode::encode_to_vec(self, config::standard()).map_err(|e| {
                     PyErr::new::<PyValueError, _>(format!(
                         "Serialization of Vocabulary failed: {}",
                         e
                     ))
                 })?;
-            Ok((cls.getattr("from_binary")?.to_object(py), (binary_data,)))
+            Ok((cls.getattr("from_binary")?.unbind(), (binary_data,)))
         })
     }