feat: use latest PyO3

Author: 7086cmd

Cargo.lock

@@ -29,7 +29,7 @@ mongodb = { version = "2.8.2", features = ["async-std"] }
 once_cell = "1.19.0"
 pem = { version = "3.0.4", features = ["serde"] }
 polars = "0.39.2"
-pyo3 = { version = "0.16", features = ["auto-initialize"] }
+pyo3 = { version = "0.21.2", features = ["auto-initialize"] }
 rand = "0.8.5"
 reqwest = "0.12.3"
 rsa = "0.9.6"

Cargo.toml

@@ -0,0 +1,5 @@
+import pandas as pd
+
+def read_and_save_csv(input_path, output_path):
+    df = pd.read_csv(input_path, encoding='utf-8')
+    df.to_excel(output_path, index=False)

src/utils/format/convert.py

@@ -1,35 +1,25 @@
-use pyo3::prelude::*;
-use pyo3::types::IntoPyDict;
+use pyo3::types::{PyAnyMethods, PyModule};
+use pyo3::{Py, PyAny, PyResult, Python};
 
-pub fn to_excel() -> Result<(), String> {
-    let gil = Python::acquire_gil();
-    let py = gil.python();
-
-    let code = r#"
-import pandas as pd
-
-def read_and_save_csv(input_path, output_path):
-    df = pd.read_csv(input_path, encoding='utf-8')
-    df.to_excel(output_path, index=False)
-"#;
-
-    py.run(code, None, None).unwrap();
-
-    let pandas = py.import("pandas");
-    if let Err(_) = pandas {
-        return Err("Failed to import pandas".to_string());
-    }
-    let pandas = pandas.unwrap();
-    let locales = [("pd", pandas)].into_py_dict(py);
-    let func = py.eval("read_and_save_csv", None, Some(locales));
-    if let Err(_) = func {
-        return Err("Failed to get Python function".to_string());
-    }
-    let func = func.unwrap().extract();
-    if let Err(_) = func {
-        return Err("Failed to extract Python function".to_string());
-    }
-    let func: Py<PyAny> = func.unwrap();
-    let _ = func.call1(py, ("output.csv", "output.xlsx"));
-    Ok(())
+pub fn to_excel() -> PyResult<()> {
+    Python::with_gil(|py| {
+        let bound = PyModule::from_code_bound(
+            py,
+            r#"
+def to_excel(input_path: str, output_path: str):
+    import pandas as pd
+    pd.read_csv(input_path, encoding='utf-8').to_excel(output_path, index=False)
+"#,
+            "",
+            "",
+        );
+        if let Err(_) = bound {
+            return Err(pyo3::PyErr::new::<pyo3::exceptions::PyRuntimeError, _>(
+                "Failed to get Python function",
+            ));
+        }
+        let bound: Py<PyAny> = bound.unwrap().getattr("to_excel")?.into();
+        let _ = bound.call1(py, ("output.csv", "output.xlsx"));
+        Ok(())
+    })
 }