Skip to content
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

Jump to bottom

fix: Fix categorical #106

Merged
merged 2 commits into from
Sep 12, 2024
Merged

fix: Fix categorical #106

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a30709
fix: Fix categorical
ritchie46 Sep 12, 2024
b7b9895
fix: Fix categorical
ritchie46 Sep 12, 2024
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
15 changes: 7 additions & 8 deletions pyo3-polars/src/types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ use super::*;
use crate::error::PyPolarsErr;
use crate::ffi::to_py::to_py_array;
use polars::export::arrow;
#[cfg(feature = "dtype-categorical")]
use polars_core::datatypes::create_enum_data_type;
use polars_core::datatypes::{CompatLevel, DataType};
use polars_core::prelude::*;
use polars_core::utils::materialize_dyn_int;
Expand Down Expand Up @@ -343,7 +341,7 @@ impl IntoPy<PyObject> for PyExpr {
}
}

#[cfg(feature = "dtype-full")]
#[cfg(feature = "dtype-categorical")]
pub(crate) fn to_series(py: Python, s: PySeries) -> PyObject {
let series = SERIES.bind(py);
let constructor = series
Expand Down Expand Up @@ -575,11 +573,12 @@ impl<'py> FromPyObject<'py> for PyDataType {
#[cfg(feature = "dtype-categorical")]
"Categorical" => {
let ordering = ob.getattr(intern!(py, "ordering")).unwrap();

let ordering = match ordering.extract::<&str>()? {
"physical" => CategoricalOrdering::Physical,
"lexical" => CategoricalOrdering::Lexical,
let ordering = ordering.extract::<PyBackedStr>()?;
let ordering = match ordering.as_bytes() {
b"physical" => CategoricalOrdering::Physical,
b"lexical" => CategoricalOrdering::Lexical,
ordering => {
let ordering = std::str::from_utf8(ordering).unwrap();
return Err(PyValueError::new_err(format!("invalid ordering argument: {ordering}")))
}
};
Expand All @@ -592,7 +591,7 @@ impl<'py> FromPyObject<'py> for PyDataType {
let s = get_series(&categories.as_borrowed())?;
let ca = s.str().map_err(PyPolarsErr::from)?;
let categories = ca.downcast_iter().next().unwrap().clone();
create_enum_data_type(categories)
DataType::Enum(Some(Arc::new(RevMapping::build_local(categories))), Default::default())
},
"Date" => DataType::Date,
"Time" => DataType::Time,
Expand Down
Loading