refactor(rust): Map Polars AssertionError to pyo3's `AssertionError…

…` and improve macro flexibility (#21495)
pola-rs · Feb 28, 2025 · 7360d15 · 7360d15
1 parent abe2a57
commit 7360d15
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/crates/polars-error/src/lib.rs b/crates/polars-error/src/lib.rs
@@ -411,12 +411,12 @@ on startup."#.trim_start())
             $dtype,
         )
     };
-    (assert_eq = $lhs:expr, $rhs:expr) => {
+    (assertion_error = $objects:expr, $detail:expr, $lhs:expr, $rhs:expr) => {
         $crate::polars_err!(
-            AssertionError: "equality assertion failed: {} != {}",
-            $lhs, $rhs
+            AssertionError: "{} are different ({})\n[left]: {}\n[right]: {}",
+            $objects, $detail, $lhs, $rhs
         )
-    }
+    };
 }
 
 #[macro_export]

diff --git a/crates/polars-python/src/error.rs b/crates/polars-python/src/error.rs
@@ -12,7 +12,7 @@ use pyo3::prelude::*;
 use pyo3::PyTypeInfo;
 
 use crate::exceptions::{
-    AssertionError, CategoricalRemappingWarning, ColumnNotFoundError, ComputeError, DuplicateError,
+    CategoricalRemappingWarning, ColumnNotFoundError, ComputeError, DuplicateError,
     InvalidOperationError, MapWithoutReturnDtypeWarning, NoDataError, OutOfBoundsError,
     SQLInterfaceError, SQLSyntaxError, SchemaError, SchemaFieldNotFoundError, ShapeError,
     StringCacheMismatchError, StructFieldNotFoundError,
@@ -68,7 +68,9 @@ impl From<PyPolarsErr> for PyErr {
         use PyPolarsErr::*;
         match err {
             Polars(err) => match err {
-                PolarsError::AssertionError(err) => AssertionError::new_err(err.to_string()),
+                PolarsError::AssertionError(err) => {
+                    pyo3::exceptions::PyAssertionError::new_err(err.to_string())
+                },
                 PolarsError::ColumnNotFound(name) => ColumnNotFoundError::new_err(name.to_string()),
                 PolarsError::ComputeError(err) => ComputeError::new_err(err.to_string()),
                 PolarsError::Duplicate(err) => DuplicateError::new_err(err.to_string()),

diff --git a/crates/polars-python/src/exceptions.rs b/crates/polars-python/src/exceptions.rs
@@ -5,7 +5,6 @@ use pyo3::exceptions::{PyException, PyWarning};
 
 // Errors
 create_exception!(polars.exceptions, PolarsError, PyException);
-create_exception!(polars.exceptions, AssertionError, PolarsError);
 create_exception!(polars.exceptions, ColumnNotFoundError, PolarsError);
 create_exception!(polars.exceptions, ComputeError, PolarsError);
 create_exception!(polars.exceptions, DuplicateError, PolarsError);