Merge pull request #103 from influxdata/crepererum/pyo3-027

chore: `pyo3` 0.27

Author: crepererum

Cargo.lock

@@ -24,7 +24,7 @@ datafusion-udf-wasm-bundle = { path = "guests/bundle", version = "0.1.0" }
 datafusion-udf-wasm-guest = { path = "guests/rust", version = "0.1.0" }
 datafusion-udf-wasm-python = { path = "guests/python", version = "0.1.0" }
 tokio = { version = "1.48.0", default-features = false }
-pyo3 = { version = "0.26.0", default-features = false }
+pyo3 = { version = "0.27.0", default-features = false }
 tar = { version = "0.4.44", default-features = false }
 tempfile = { version = "3.23.0", default-features = false }
 wasmtime = { version = "37.0.2", default-features = false, features = ["async", "cranelift"] }
@@ -63,9 +63,6 @@ private_intra_doc_links = "deny"
 datafusion-common = { git = "https://github.com/influxdata/arrow-datafusion.git", rev = "8347a71f62d4fef8d37548f22b93877170039357" }
 datafusion-expr = { git = "https://github.com/influxdata/arrow-datafusion.git", rev = "8347a71f62d4fef8d37548f22b93877170039357" }
 
-# This is version 0.26.0 with https://github.com/PyO3/pyo3/pull/5368 backported.
-pyo3 = { git = "https://github.com/crepererum/pyo3.git", rev = "2a9f7e5b3d3203f3dc517c42352946bb6f352551" }
-
 # faster tests
 [profile.dev.package]
 # improve wasmtime compilation speed

Cargo.toml

@@ -57,6 +57,5 @@ unused-allowed-source = "deny"
 
 [sources.allow-org]
 github = [
-    "crepererum",
     "influxdata",
 ]

deny.toml

@@ -336,7 +336,7 @@ impl<'py> ArrayBuilder<'py> for Float64Builder {
 impl<'py> ArrayBuilder<'py> for Int64Builder {
     fn push(&mut self, val: Bound<'py, PyAny>) -> DataFusionResult<()> {
         // in Python, `bool` is a sub-class of int we should probably not silently cast bools to integers
-        let val = val.downcast_exact::<PyInt>().map_err(|_| {
+        let val = val.cast_exact::<PyInt>().map_err(|_| {
             exec_datafusion_err!("expected `int` but got {}", py_representation(&val))
         })?;
         let val: i64 = val.extract().map_err(|_| {
@@ -378,7 +378,7 @@ impl<'py> ArrayBuilder<'py> for StringBuilder {
 
 impl<'py> ArrayBuilder<'py> for TimestampMicrosecondBuilder {
     fn push(&mut self, val: Bound<'py, PyAny>) -> DataFusionResult<()> {
-        let val = val.downcast_exact::<PyDateTime>().map_err(|_| {
+        let val = val.cast_exact::<PyDateTime>().map_err(|_| {
             exec_datafusion_err!("expected `datetime` but got {}", py_representation(&val))
         })?;
         if let Some(tzinfo) = val.get_tzinfo() {

guests/python/src/conversion.rs

@@ -3,7 +3,7 @@ use std::ffi::CString;
 
 use datafusion_common::{DataFusionError, error::Result as DataFusionResult};
 use pyo3::{
-    Bound, FromPyObject, PyAny, PyErr, PyResult, Python,
+    Borrowed, Bound, FromPyObject, PyAny, PyErr, PyResult, Python,
     exceptions::PyTypeError,
     intern,
     types::{PyAnyMethods, PyDictMethods, PyModuleMethods, PyStringMethods, PyTypeMethods},
@@ -14,8 +14,10 @@ use crate::{
     signature::{PythonFn, PythonFnSignature, PythonNullableType, PythonType},
 };
 
-impl<'py> FromPyObject<'py> for PythonType {
-    fn extract_bound(ob: &Bound<'py, PyAny>) -> PyResult<Self> {
+impl<'a, 'py> FromPyObject<'a, 'py> for PythonType {
+    type Error = PyErr;
+
+    fn extract(ob: Borrowed<'a, 'py, PyAny>) -> PyResult<Self> {
         let py = ob.py();
 
         // https://docs.python.org/3/library/builtins.html
@@ -42,14 +44,16 @@ impl<'py> FromPyObject<'py> for PythonType {
         } else {
             Err(PyErr::new::<PyTypeError, _>(format!(
                 "unknown annotation type: {}",
-                py_representation(ob)
+                py_representation(ob.as_any())
             )))
         }
     }
 }
 
-impl<'py> FromPyObject<'py> for PythonNullableType {
-    fn extract_bound(ob: &Bound<'py, PyAny>) -> PyResult<Self> {
+impl<'a, 'py> FromPyObject<'a, 'py> for PythonNullableType {
+    type Error = PyErr;
+
+    fn extract(ob: Borrowed<'a, 'py, PyAny>) -> PyResult<Self> {
         let py = ob.py();
 
         // https://docs.python.org/3/library/inspect.html
@@ -105,11 +109,13 @@ impl<'py> FromPyObject<'py> for PythonNullableType {
     }
 }
 
-impl<'py> FromPyObject<'py> for PythonFnSignature {
+impl<'a, 'py> FromPyObject<'a, 'py> for PythonFnSignature {
+    type Error = PyErr;
+
     /// Convert [`inspect.Signature`] to [`PythonFnSignature`].
     ///
     /// [`inspect.Signature`]: https://docs.python.org/3/library/inspect.html#inspect.Signature
-    fn extract_bound(ob: &Bound<'py, PyAny>) -> PyResult<Self> {
+    fn extract(ob: Borrowed<'a, 'py, PyAny>) -> PyResult<Self> {
         let py = ob.py();
 
         // https://docs.python.org/3/library/inspect.html