feat(native): Initial support for Python 3.13

Author: ovr

.github/workflows/publish.yml

@@ -74,7 +74,7 @@ jobs:
     strategy:
       matrix:
         node-version: [22]
-        python-version: ["3.9", "3.10", "3.11", "3.12", "fallback"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "fallback"]
         target: ["x86_64-unknown-linux-gnu", "aarch64-unknown-linux-gnu"]
         include:
           - target: x86_64-unknown-linux-gnu
@@ -155,7 +155,7 @@ jobs:
         node-version: [22.x]
         os-version: ["macos-13"]
         target: ["x86_64-apple-darwin", "aarch64-apple-darwin"]
-        python-version: ["3.9", "3.10", "3.11", "3.12", "fallback"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "fallback"]
         include:
           - target: x86_64-apple-darwin
             package_target_arch: x64

.github/workflows/rust-cubesql.yml

@@ -128,7 +128,7 @@ jobs:
         # Current used version + 1 LTS
         # TODO: Add 24 after it's been released (don't forget to uncomment excludes below!)
         node-version: [22]
-        python-version: ["3.9", "3.10", "3.11", "3.12", "fallback"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "fallback"]
         target: ["x86_64-unknown-linux-gnu", "aarch64-unknown-linux-gnu"]
         # minimize number of jobs
         exclude:
@@ -243,6 +243,8 @@ jobs:
             python-version: "3.11"
           - target: x86_64-apple-darwin
             python-version: "3.12"
+          - target: x86_64-apple-darwin
+            python-version: "3.13"
           - target: x86_64-apple-darwin
             python-version: "fallback"
           - target: aarch64-apple-darwin

packages/cubejs-backend-native/Cargo.lock

@@ -34,11 +34,8 @@ log-reroute = "0.1"
 minijinja = { version = "1", features = ["json", "loader"] }
 once_cell = "1.10"
 # python
-pyo3 = { version = "0.20.0", features = [], optional = true }
-pyo3-asyncio = { version = "0.20.0", features = [
-    "tokio-runtime",
-    "attributes",
-], optional = true }
+pyo3 = { version = "0.22.6", features = ["gil-refs", "py-clone"], optional = true }
+pyo3-async-runtimes = { version = "0.22.0", features = ["tokio-runtime", "attributes"], optional = true }
 serde = { version = "1.0.217", features = ["derive"] }
 serde_json = "1.0.127"
 simple_logger = "1.7.0"
@@ -54,4 +51,4 @@ features = ["napi-1", "napi-4", "napi-6", "futures"]
 default = ["neon-entrypoint"]
 neon-debug = []
 neon-entrypoint = []
-python = ["pyo3", "pyo3-asyncio"]
+python = ["pyo3", "pyo3-async-runtimes"]

packages/cubejs-backend-native/Cargo.toml

@@ -55,6 +55,7 @@
         "value": [
           "libpython",
           [
+            "3.13",
             "3.12",
             "3.11",
             "3.10",

packages/cubejs-backend-native/package.json

@@ -6,6 +6,8 @@ use crate::cross::py_in_js::{
 };
 #[cfg(feature = "python")]
 use crate::utils::bind_method;
+#[cfg(feature = "python")]
+use pyo3::Python;
 use neon::prelude::*;
 use neon::result::Throw;
 use neon::types::JsDate;
@@ -240,7 +242,7 @@ impl CLRepr {
             #[cfg(feature = "python")]
             if from.is_a::<BoxedJsPyFunctionWrapper, _>(cx) {
                 let ref_wrap = from.downcast_or_throw::<BoxedJsPyFunctionWrapper, _>(cx)?;
-                let fun = ref_wrap.borrow().get_fun().clone();
+                let fun = Python::with_gil(|py| ref_wrap.borrow().get_fun().clone_ref(py));
 
                 return Ok(CLRepr::PythonRef(PythonRef::PyFunction(fun)));
             }

packages/cubejs-backend-native/src/cross/clrepr.rs

@@ -111,7 +111,7 @@ impl PyRuntime {
 
             let is_coroutine = unsafe { pyo3::ffi::PyCoro_CheckExact(call_res.as_ptr()) == 1 };
             if is_coroutine {
-                let fut = pyo3_asyncio::tokio::into_future(call_res.as_ref(py))?;
+                let fut = pyo3_async_runtimes::tokio::into_future(call_res.bind(py).clone())?;
                 Ok(PyScheduledFunResult::Poll(Box::pin(fut)))
             } else {
                 Ok(PyScheduledFunResult::Ready(CLRepr::from_python_ref(
@@ -206,12 +206,12 @@ impl PyRuntime {
             trace!("Initializing executor in a separate thread");
 
             std::thread::spawn(|| {
-                pyo3_asyncio::tokio::get_runtime()
-                    .block_on(pyo3_asyncio::tokio::re_exports::pending::<()>())
+                pyo3_async_runtimes::tokio::get_runtime()
+                    .block_on(pyo3_async_runtimes::tokio::re_exports::pending::<()>())
             });
 
             let res = Python::with_gil(|py| -> Result<(), PyErr> {
-                pyo3_asyncio::tokio::run(py, async move {
+                pyo3_async_runtimes::tokio::run(py, async move {
                     loop {
                         if let Some(task) = receiver.recv().await {
                             trace!("New task");
@@ -247,7 +247,7 @@ pub fn py_runtime_init<'a, C: Context<'a>>(
 
     pyo3::prepare_freethreaded_python();
     // it's safe to unwrap
-    pyo3_asyncio::tokio::init_with_runtime(runtime).unwrap();
+    pyo3_async_runtimes::tokio::init_with_runtime(runtime).unwrap();
 
     if PY_RUNTIME.set(PyRuntime::new(channel)).is_err() {
         cx.throw_error("Error on setting PyRuntime")

packages/cubejs-backend-native/src/python/runtime.rs

@@ -254,7 +254,7 @@ impl Object for JinjaPythonFunction {
             )
         })?;
 
-        let call_future = py_runtime.call_async(self.inner.clone(), arguments);
+        let call_future = Python::with_gil(|py| py_runtime.call_async(self.inner.clone_ref(py), arguments));
 
         let tokio = tokio_runtime().map_err(|err| {
             mj::Error::new(