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: Printed results not visible in debugger & notebooks #296

Merged
merged 2 commits into from
Mar 22, 2023
Merged

fix: Printed results not visible in debugger & notebooks #296

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9dca55b
Use builtin print function for show
simicd Mar 21, 2023
16fee9f
Refactor
simicd Mar 21, 2023
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
23 changes: 19 additions & 4 deletions src/dataframe.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,7 @@ impl PyDataFrame {
#[pyo3(signature = (num=20))]
fn show(&self, py: Python, num: usize) -> PyResult<()> {
let df = self.df.as_ref().clone().limit(0, Some(num))?;
let batches = wait_for_future(py, df.collect())?;
pretty::print_batches(&batches).map_err(|err| PyArrowException::new_err(err.to_string()))
print_dataframe(py, df)
}

/// Filter out duplicate rows
Expand Down Expand Up @@ -217,8 +216,7 @@ impl PyDataFrame {
#[pyo3(signature = (verbose=false, analyze=false))]
fn explain(&self, py: Python, verbose: bool, analyze: bool) -> PyResult<()> {
let df = self.df.as_ref().clone().explain(verbose, analyze)?;
let batches = wait_for_future(py, df.collect())?;
pretty::print_batches(&batches).map_err(|err| PyArrowException::new_err(err.to_string()))
print_dataframe(py, df)
}

/// Get the logical plan for this `DataFrame`
Expand Down Expand Up @@ -389,3 +387,20 @@ impl PyDataFrame {
Ok(wait_for_future(py, self.df.as_ref().clone().count())?)
}
}

/// Print DataFrame
fn print_dataframe(py: Python, df: DataFrame) -> PyResult<()> {
// Get string representation of record batches
let batches = wait_for_future(py, df.collect())?;
let batches_as_string = pretty::pretty_format_batches(&batches);
let result = match batches_as_string {
Ok(batch) => format!("DataFrame()\n{batch}"),
Err(err) => format!("Error: {:?}", err.to_string()),
};

// Import the Python 'builtins' module to access the print function
// Note that println! does not print to the Python debug console and is not visible in notebooks for instance
let print = py.import("builtins")?.getattr("print")?;
print.call1((result,))?;
Ok(())
}