Skip to content

Extract Rust<->Python binding logic into a module for reuse #122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 13, 2025
Merged

Extract Rust<->Python binding logic into a module for reuse #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
179 changes: 7 additions & 172 deletions src/ops/py_factory.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,190 +1,25 @@
use std::{collections::BTreeMap, sync::Arc};
use std::sync::Arc;

use axum::async_trait;
use futures::FutureExt;
use pyo3::{
exceptions::PyException,
pyclass, pymethods,
types::{IntoPyDict, PyAnyMethods, PyList, PyString, PyTuple},
Bound, IntoPyObjectExt, Py, PyAny, PyResult, Python,
types::{IntoPyDict, PyString, PyTuple},
IntoPyObjectExt, Py, PyAny, Python,
};
use pythonize::pythonize;

use crate::{
base::{schema, value},
builder::plan,
py::IntoPyResult,
py,
};
use anyhow::Result;

use super::sdk::{
ExecutorFuture, FlowInstanceContext, SimpleFunctionExecutor, SimpleFunctionFactory,
};

fn basic_value_to_py_object<'py>(
py: Python<'py>,
v: &value::BasicValue,
) -> PyResult<Bound<'py, PyAny>> {
let result = match v {
value::BasicValue::Bytes(v) => v.into_bound_py_any(py)?,
value::BasicValue::Str(v) => v.into_bound_py_any(py)?,
value::BasicValue::Bool(v) => v.into_bound_py_any(py)?,
value::BasicValue::Int64(v) => v.into_bound_py_any(py)?,
value::BasicValue::Float32(v) => v.into_bound_py_any(py)?,
value::BasicValue::Float64(v) => v.into_bound_py_any(py)?,
value::BasicValue::Vector(v) => v
.iter()
.map(|v| basic_value_to_py_object(py, v))
.collect::<PyResult<Vec<_>>>()?
.into_bound_py_any(py)?,
_ => {
return Err(PyException::new_err(format!(
"unsupported value type: {}",
v.kind()
)))
}
};
Ok(result)
}

fn field_values_to_py_object<'py, 'a>(
py: Python<'py>,
values: impl Iterator<Item = &'a value::Value>,
) -> PyResult<Bound<'py, PyAny>> {
let fields = values
.map(|v| value_to_py_object(py, v))
.collect::<PyResult<Vec<_>>>()?;
Ok(PyTuple::new(py, fields)?.into_any())
}

fn value_to_py_object<'py>(py: Python<'py>, v: &value::Value) -> PyResult<Bound<'py, PyAny>> {
let result = match v {
value::Value::Null => py.None().into_bound(py),
value::Value::Basic(v) => basic_value_to_py_object(py, v)?,
value::Value::Struct(v) => field_values_to_py_object(py, v.fields.iter())?,
value::Value::Collection(v) | value::Value::List(v) => {
let rows = v
.iter()
.map(|v| field_values_to_py_object(py, v.0.fields.iter()))
.collect::<PyResult<Vec<_>>>()?;
PyList::new(py, rows)?.into_any()
}
value::Value::Table(v) => {
let rows = v
.iter()
.map(|(k, v)| {
field_values_to_py_object(
py,
std::iter::once(&value::Value::from(k.clone())).chain(v.0.fields.iter()),
)
})
.collect::<PyResult<Vec<_>>>()?;
PyList::new(py, rows)?.into_any()
}
};
Ok(result)
}

fn basic_value_from_py_object<'py>(
typ: &schema::BasicValueType,
v: &Bound<'py, PyAny>,
) -> PyResult<value::BasicValue> {
let result = match typ {
schema::BasicValueType::Bytes => {
value::BasicValue::Bytes(Arc::from(v.extract::<Vec<u8>>()?))
}
schema::BasicValueType::Str => value::BasicValue::Str(Arc::from(v.extract::<String>()?)),
schema::BasicValueType::Bool => value::BasicValue::Bool(v.extract::<bool>()?),
schema::BasicValueType::Int64 => value::BasicValue::Int64(v.extract::<i64>()?),
schema::BasicValueType::Float32 => value::BasicValue::Float32(v.extract::<f32>()?),
schema::BasicValueType::Float64 => value::BasicValue::Float64(v.extract::<f64>()?),
schema::BasicValueType::Vector(elem) => value::BasicValue::Vector(Arc::from(
v.extract::<Vec<Bound<'py, PyAny>>>()?
.into_iter()
.map(|v| basic_value_from_py_object(&elem.element_type, &v))
.collect::<PyResult<Vec<_>>>()?,
)),
_ => {
return Err(PyException::new_err(format!(
"unsupported value type: {}",
typ
)))
}
};
Ok(result)
}

fn field_values_from_py_object<'py>(
schema: &schema::StructSchema,
v: &Bound<'py, PyAny>,
) -> PyResult<value::FieldValues> {
let list = v.extract::<Vec<Bound<'py, PyAny>>>()?;
if list.len() != schema.fields.len() {
return Err(PyException::new_err(format!(
"struct field number mismatch, expected {}, got {}",
schema.fields.len(),
list.len()
)));
}
Ok(value::FieldValues {
fields: schema
.fields
.iter()
.zip(list.into_iter())
.map(|(f, v)| value_from_py_object(&f.value_type.typ, &v))
.collect::<PyResult<Vec<_>>>()?,
})
}

fn value_from_py_object<'py>(
typ: &schema::ValueType,
v: &Bound<'py, PyAny>,
) -> PyResult<value::Value> {
let result = if v.is_none() {
value::Value::Null
} else {
match typ {
schema::ValueType::Basic(typ) => {
value::Value::Basic(basic_value_from_py_object(typ, v)?)
}
schema::ValueType::Struct(schema) => {
value::Value::Struct(field_values_from_py_object(schema, v)?)
}
schema::ValueType::Collection(schema) => {
let list = v.extract::<Vec<Bound<'py, PyAny>>>()?;
let values = list
.into_iter()
.map(|v| field_values_from_py_object(&schema.row, &v))
.collect::<PyResult<Vec<_>>>()?;
match schema.kind {
schema::CollectionKind::Collection => {
value::Value::Collection(values.into_iter().map(|v| v.into()).collect())
}
schema::CollectionKind::List => {
value::Value::List(values.into_iter().map(|v| v.into()).collect())
}
schema::CollectionKind::Table => value::Value::Table(
values
.into_iter()
.map(|v| {
let mut iter = v.fields.into_iter();
let key = iter.next().unwrap().to_key().into_py_result()?;
Ok((
key,
value::ScopeValue(value::FieldValues {
fields: iter.collect::<Vec<_>>(),
}),
))
})
.collect::<PyResult<BTreeMap<_, _>>>()?,
),
}
}
}
};
Ok(result)
}

#[pyclass(name = "OpArgSchema")]
pub struct PyOpArgSchema {
value_type: crate::py::Pythonized<schema::EnrichedValueType>,
Expand Down Expand Up @@ -222,7 +57,7 @@ impl SimpleFunctionExecutor for Arc<PyFunctionExecutor> {
Python::with_gil(|py| -> Result<_> {
let mut args = Vec::with_capacity(self.num_positional_args);
for v in input[0..self.num_positional_args].iter() {
args.push(value_to_py_object(py, v)?);
args.push(py::value_to_py_object(py, v)?);
}

let kwargs = if self.kw_args_names.is_empty() {
Expand All @@ -234,7 +69,7 @@ impl SimpleFunctionExecutor for Arc<PyFunctionExecutor> {
.iter()
.zip(input[self.num_positional_args..].iter())
{
kwargs.push((name.bind(py), value_to_py_object(py, v)?));
kwargs.push((name.bind(py), py::value_to_py_object(py, v)?));
}
Some(kwargs)
};
Expand All @@ -248,7 +83,7 @@ impl SimpleFunctionExecutor for Arc<PyFunctionExecutor> {
.as_ref(),
)?;

Ok(value_from_py_object(
Ok(py::value_from_py_object(
&self.result_type.typ,
result.bind(py),
)?)
Expand Down
Loading