Expression support for polars uppercase and polars lowercase (#13724)

This commit is contained in:
Jack Wright 2024-08-28 14:08:16 -07:00 committed by GitHub
parent f58a4b5017
commit 644bebf4c6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 166 additions and 56 deletions

View File

@ -1,4 +1,9 @@
use crate::{values::CustomValueSupport, PolarsPlugin}; use crate::{
values::{
cant_convert_err, CustomValueSupport, NuExpression, PolarsPluginObject, PolarsPluginType,
},
PolarsPlugin,
};
use super::super::super::values::{Column, NuDataFrame}; use super::super::super::values::{Column, NuDataFrame};
@ -24,33 +29,58 @@ impl PluginCommand for ToLowerCase {
fn signature(&self) -> Signature { fn signature(&self) -> Signature {
Signature::build(self.name()) Signature::build(self.name())
.input_output_type( .input_output_types(vec![
Type::Custom("dataframe".into()), (
Type::Custom("dataframe".into()), Type::Custom("dataframe".into()),
) Type::Custom("dataframe".into()),
),
(
Type::Custom("expression".into()),
Type::Custom("expression".into()),
),
])
.category(Category::Custom("dataframe".into())) .category(Category::Custom("dataframe".into()))
} }
fn examples(&self) -> Vec<Example> { fn examples(&self) -> Vec<Example> {
vec![Example { vec![
description: "Modifies strings to lowercase", Example {
example: "[Abc aBc abC] | polars into-df | polars lowercase", description: "Modifies strings in a column to lowercase",
result: Some( example: "[[a]; [Abc]] | polars into-df | polars select (polars col a | polars lowercase) | polars collect",
NuDataFrame::try_from_columns( result: Some(
vec![Column::new( NuDataFrame::try_from_columns(
"0".to_string(), vec![Column::new(
vec![ "a".to_string(),
Value::test_string("abc"), vec![
Value::test_string("abc"), Value::test_string("abc"),
Value::test_string("abc"), ],
], )],
)], None,
None, )
) .expect("simple df for test should not fail")
.expect("simple df for test should not fail") .into_value(Span::test_data()),
.into_value(Span::test_data()), ),
), },
}] Example {
description: "Modifies strings to lowercase",
example: "[Abc aBc abC] | polars into-df | polars lowercase",
result: Some(
NuDataFrame::try_from_columns(
vec![Column::new(
"0".to_string(),
vec![
Value::test_string("abc"),
Value::test_string("abc"),
Value::test_string("abc"),
],
)],
None,
)
.expect("simple df for test should not fail")
.into_value(Span::test_data()),
),
},
]
} }
fn run( fn run(
@ -60,17 +90,42 @@ impl PluginCommand for ToLowerCase {
call: &EvaluatedCall, call: &EvaluatedCall,
input: PipelineData, input: PipelineData,
) -> Result<PipelineData, LabeledError> { ) -> Result<PipelineData, LabeledError> {
command(plugin, engine, call, input).map_err(LabeledError::from) let value = input.into_value(call.head)?;
match PolarsPluginObject::try_from_value(plugin, &value)? {
PolarsPluginObject::NuDataFrame(df) => command_df(plugin, engine, call, df),
PolarsPluginObject::NuLazyFrame(lazy) => {
command_df(plugin, engine, call, lazy.collect(call.head)?)
}
PolarsPluginObject::NuExpression(expr) => command_expr(plugin, engine, call, expr),
_ => Err(cant_convert_err(
&value,
&[
PolarsPluginType::NuDataFrame,
PolarsPluginType::NuLazyFrame,
PolarsPluginType::NuExpression,
],
)),
}
.map_err(LabeledError::from)
} }
} }
fn command( fn command_expr(
plugin: &PolarsPlugin, plugin: &PolarsPlugin,
engine: &EngineInterface, engine: &EngineInterface,
call: &EvaluatedCall, call: &EvaluatedCall,
input: PipelineData, expr: NuExpression,
) -> Result<PipelineData, ShellError> {
let res: NuExpression = expr.into_polars().str().to_lowercase().into();
res.to_pipeline_data(plugin, engine, call.head)
}
fn command_df(
plugin: &PolarsPlugin,
engine: &EngineInterface,
call: &EvaluatedCall,
df: NuDataFrame,
) -> Result<PipelineData, ShellError> { ) -> Result<PipelineData, ShellError> {
let df = NuDataFrame::try_from_pipeline_coerce(plugin, input, call.head)?;
let series = df.as_series(call.head)?; let series = df.as_series(call.head)?;
let casted = series.str().map_err(|e| ShellError::GenericError { let casted = series.str().map_err(|e| ShellError::GenericError {

View File

@ -1,4 +1,9 @@
use crate::{values::CustomValueSupport, PolarsPlugin}; use crate::{
values::{
cant_convert_err, CustomValueSupport, NuExpression, PolarsPluginObject, PolarsPluginType,
},
PolarsPlugin,
};
use super::super::super::values::{Column, NuDataFrame}; use super::super::super::values::{Column, NuDataFrame};
@ -28,33 +33,58 @@ impl PluginCommand for ToUpperCase {
fn signature(&self) -> Signature { fn signature(&self) -> Signature {
Signature::build(self.name()) Signature::build(self.name())
.input_output_type( .input_output_types(vec![
Type::Custom("dataframe".into()), (
Type::Custom("dataframe".into()), Type::Custom("dataframe".into()),
) Type::Custom("dataframe".into()),
),
(
Type::Custom("expression".into()),
Type::Custom("expression".into()),
),
])
.category(Category::Custom("dataframe".into())) .category(Category::Custom("dataframe".into()))
} }
fn examples(&self) -> Vec<Example> { fn examples(&self) -> Vec<Example> {
vec![Example { vec![
description: "Modifies strings to uppercase", Example {
example: "[Abc aBc abC] | polars into-df | polars uppercase", description: "Modifies strings in a column to uppercase",
result: Some( example: "[[a]; [Abc]] | polars into-df | polars select (polars col a | polars uppercase) | polars collect",
NuDataFrame::try_from_columns( result: Some(
vec![Column::new( NuDataFrame::try_from_columns(
"0".to_string(), vec![Column::new(
vec![ "a".to_string(),
Value::test_string("ABC"), vec![
Value::test_string("ABC"), Value::test_string("ABC"),
Value::test_string("ABC"), ],
], )],
)], None,
None, )
) .expect("simple df for test should not fail")
.expect("simple df for test should not fail") .into_value(Span::test_data()),
.into_value(Span::test_data()), ),
), },
}] Example {
description: "Modifies strings to uppercase",
example: "[Abc aBc abC] | polars into-df | polars uppercase",
result: Some(
NuDataFrame::try_from_columns(
vec![Column::new(
"0".to_string(),
vec![
Value::test_string("ABC"),
Value::test_string("ABC"),
Value::test_string("ABC"),
],
)],
None,
)
.expect("simple df for test should not fail")
.into_value(Span::test_data()),
),
},
]
} }
fn run( fn run(
@ -64,17 +94,42 @@ impl PluginCommand for ToUpperCase {
call: &EvaluatedCall, call: &EvaluatedCall,
input: PipelineData, input: PipelineData,
) -> Result<PipelineData, LabeledError> { ) -> Result<PipelineData, LabeledError> {
command(plugin, engine, call, input).map_err(LabeledError::from) let value = input.into_value(call.head)?;
match PolarsPluginObject::try_from_value(plugin, &value)? {
PolarsPluginObject::NuDataFrame(df) => command_df(plugin, engine, call, df),
PolarsPluginObject::NuLazyFrame(lazy) => {
command_df(plugin, engine, call, lazy.collect(call.head)?)
}
PolarsPluginObject::NuExpression(expr) => command_expr(plugin, engine, call, expr),
_ => Err(cant_convert_err(
&value,
&[
PolarsPluginType::NuDataFrame,
PolarsPluginType::NuLazyFrame,
PolarsPluginType::NuExpression,
],
)),
}
.map_err(LabeledError::from)
} }
} }
fn command( fn command_expr(
plugin: &PolarsPlugin, plugin: &PolarsPlugin,
engine: &EngineInterface, engine: &EngineInterface,
call: &EvaluatedCall, call: &EvaluatedCall,
input: PipelineData, expr: NuExpression,
) -> Result<PipelineData, ShellError> {
let res: NuExpression = expr.into_polars().str().to_uppercase().into();
res.to_pipeline_data(plugin, engine, call.head)
}
fn command_df(
plugin: &PolarsPlugin,
engine: &EngineInterface,
call: &EvaluatedCall,
df: NuDataFrame,
) -> Result<PipelineData, ShellError> { ) -> Result<PipelineData, ShellError> {
let df = NuDataFrame::try_from_pipeline_coerce(plugin, input, call.head)?;
let series = df.as_series(call.head)?; let series = df.as_series(call.head)?;
let casted = series.str().map_err(|e| ShellError::GenericError { let casted = series.str().map_err(|e| ShellError::GenericError {