feat: IntoPyObject implementations for arbitrary types

This commit is contained in:
2025-03-15 15:29:40 -04:00
parent 25f1554870
commit 70c2380d0c
4 changed files with 50 additions and 4 deletions

View File

@@ -4,6 +4,7 @@ use ijson::{IArray, INumber, IObject, IString, IValue};
use pyo3::{ use pyo3::{
exceptions::{PyTypeError, PyValueError}, exceptions::{PyTypeError, PyValueError},
prelude::*, prelude::*,
types::{PyList, PyNone},
}; };
use snafu::Snafu; use snafu::Snafu;
@@ -89,3 +90,24 @@ impl<'py> FromPyObject<'py> for Arbitrary {
} }
} }
} }
impl<'py> IntoPyObject<'py> for Arbitrary {
type Target = PyAny;
type Output = Bound<'py, Self::Target>;
type Error = PyErr;
fn into_pyobject(self, py: Python<'py>) -> Result<Self::Output, Self::Error> {
match self {
Arbitrary::Null => Ok(PyNone::get(py).to_owned().into_any()),
Arbitrary::Bool(b) => Ok(b.into_pyobject(py)?.to_owned().into_any()),
Arbitrary::Integer(i) => Ok(i.into_pyobject(py)?.into_any()),
Arbitrary::Float(finite_f64) => Ok(finite_f64.into_pyobject(py)?.into_any()),
Arbitrary::String(s) => Ok(s.into_pyobject(py)?.into_any()),
Arbitrary::Array(vec) => Ok(PyList::new(py, vec)?.into_any()),
Arbitrary::Map(map) => Ok(map.into_pyobject(py)?.into_any()),
Arbitrary::DateTime(date_time) => Ok(date_time.into_pyobject(py)?.into_any()),
}
}
}

View File

@@ -1,6 +1,7 @@
use pyo3::IntoPyObject;
use snafu::Snafu; use snafu::Snafu;
#[derive(Debug, Clone, derive_more::Into)] #[derive(Debug, Clone, derive_more::Into, IntoPyObject)]
pub struct FiniteF64(f64); pub struct FiniteF64(f64);
#[derive(Debug, Snafu)] #[derive(Debug, Snafu)]

View File

@@ -4,12 +4,12 @@ use pyo3::prelude::*;
use super::{arbitrary::Arbitrary, map_key::MapKey}; use super::{arbitrary::Arbitrary, map_key::MapKey};
#[derive(Debug, Clone, derive_more::From, derive_more::Into)] #[derive(Debug, Clone, Default, derive_more::From, derive_more::Into, IntoPyObject)]
pub struct Map(pub BTreeMap<MapKey, Arbitrary>); pub struct Map(pub BTreeMap<MapKey, Arbitrary>);
impl<'py> FromPyObject<'py> for Map { impl<'py> FromPyObject<'py> for Map {
fn extract_bound(ob: &Bound<'py, PyAny>) -> PyResult<Self> { fn extract_bound(ob: &Bound<'py, PyAny>) -> PyResult<Self> {
let inner: BTreeMap<MapKey, Arbitrary> = ob.extract()?; let inner = ob.extract()?;
Ok(Self(inner)) Ok(Self(inner))
} }

View File

@@ -4,7 +4,11 @@ use chrono::DateTime;
use chrono_tz::Tz; use chrono_tz::Tz;
use ijson::IString; use ijson::IString;
use itertools::Itertools; use itertools::Itertools;
use pyo3::{exceptions::PyTypeError, prelude::*, types::PyNone}; use pyo3::{
exceptions::PyTypeError,
prelude::*,
types::{PyNone, PyTuple},
};
use super::arbitrary::{Arbitrary, MapKeyFromArbitraryError}; use super::arbitrary::{Arbitrary, MapKeyFromArbitraryError};
@@ -58,6 +62,25 @@ impl<'py> FromPyObject<'py> for MapKey {
} }
} }
impl<'py> IntoPyObject<'py> for MapKey {
type Target = PyAny;
type Output = Bound<'py, Self::Target>;
type Error = PyErr;
fn into_pyobject(self, py: Python<'py>) -> Result<Self::Output, Self::Error> {
match self {
MapKey::Null => Ok(PyNone::get(py).to_owned().into_any()),
MapKey::Bool(b) => Ok(b.into_pyobject(py)?.to_owned().into_any()),
MapKey::Integer(i) => Ok(i.into_pyobject(py)?.into_any()),
MapKey::String(s) => Ok(s.into_pyobject(py)?.into_any()),
MapKey::Tuple(vec) => Ok(PyTuple::new(py, vec)?.into_any()),
MapKey::DateTime(date_time) => Ok(date_time.into_pyobject(py)?.into_any()),
}
}
}
impl From<MapKey> for IString { impl From<MapKey> for IString {
fn from(map_key: MapKey) -> Self { fn from(map_key: MapKey) -> Self {
Self::from(map_key.to_string()) Self::from(map_key.to_string())