edit err msg and type

narwhals-dev · Jul 15, 2024 · f277ef5 · f277ef5
1 parent 6b64120
commit f277ef5
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 25 deletions.
diff --git a/narwhals/_arrow/group_by.py b/narwhals/_arrow/group_by.py
@@ -72,15 +72,11 @@ def agg_arrow(
         simple_aggregations: dict[str, tuple[str, str]] = {}
         for expr in exprs:
             # e.g. agg(nw.mean('a')) # noqa: ERA001
-            if expr._depth != 1:  # pragma: no cover
-                msg = f"Expr._depth should be 1, found {expr._depth}"
-                raise ValueError(msg)
-            if expr._root_names is None:  # pragma: no cover
-                msg = "`Expr._root_names` cannot be None"
-                raise ValueError(msg)
-            if expr._output_names is None:  # pragma: no cover
-                msg = "`Expr._output_names` cannot be None"
-                raise ValueError(msg)
+            if (
+                expr._depth != 1 or expr._root_names is None or expr._output_names is None
+            ):  # pragma: no cover
+                msg = "Safety assertion failed, please report a bug to https://github.com/narwhals-dev/narwhals/issues"
+                raise AssertionError(msg)
 
             function_name = remove_prefix(expr._function_name, "col->")
             function_name = POLARS_TO_ARROW_AGGREGATIONS.get(function_name, function_name)

diff --git a/narwhals/_expression_parsing.py b/narwhals/_expression_parsing.py
@@ -192,8 +192,8 @@ def func(df: CompliantDataFrame) -> list[CompliantSeries]:
         if expr._output_names is not None and (
             [s.name for s in out] != expr._output_names
         ):  # pragma: no cover
-            msg = "Found invalid series name"
-            raise ValueError(msg)
+            msg = "Safety assertion failed, please report a bug to https://github.com/narwhals-dev/narwhals/issues"
+            raise AssertionError(msg)
         return out
 
     # Try tracking root and output names by combining them from all
@@ -218,8 +218,8 @@ def func(df: CompliantDataFrame) -> list[CompliantSeries]:
         (output_names is None and root_names is None)
         or (output_names is not None and root_names is not None)
     ):  # pragma: no cover
-        msg = "output_names and root_names are incompatible"
-        raise ValueError(msg)
+        msg = "Safety assertion failed, please report a bug to https://github.com/narwhals-dev/narwhals/issues"
+        raise AssertionError(msg)
 
     return plx._create_expr_from_callable(  # type: ignore[return-value]
         func,  # type: ignore[arg-type]

diff --git a/narwhals/_pandas_like/group_by.py b/narwhals/_pandas_like/group_by.py
@@ -91,7 +91,7 @@ def __iter__(self) -> Iterator[tuple[Any, PandasLikeDataFrame]]:
         )
 
 
-def agg_pandas(  # noqa: PLR0915
+def agg_pandas(
     grouped: Any,
     exprs: list[PandasLikeExpr],
     keys: list[str],
@@ -120,8 +120,8 @@ def agg_pandas(  # noqa: PLR0915
             if expr._depth == 0:
                 # e.g. agg(nw.len()) # noqa: ERA001
                 if expr._output_names is None:  # pragma: no cover
-                    msg = "`Expr._output_names` cannot be None"
-                    raise ValueError(msg)
+                    msg = "Safety assertion failed, please report a bug to https://github.com/narwhals-dev/narwhals/issues"
+                    raise AssertionError(msg)
 
                 function_name = POLARS_TO_PANDAS_AGGREGATIONS.get(
                     expr._function_name, expr._function_name
@@ -131,15 +131,11 @@ def agg_pandas(  # noqa: PLR0915
                 continue
 
             # e.g. agg(nw.mean('a')) # noqa: ERA001
-            if expr._depth != 1:  # pragma: no cover
-                msg = f"Expr._depth should be 1, found {expr._depth}"
-                raise ValueError(msg)
-            if expr._root_names is None:  # pragma: no cover
-                msg = "`Expr._root_names` cannot be None"
-                raise ValueError(msg)
-            if expr._output_names is None:  # pragma: no cover
-                msg = "`Expr._output_names` cannot be None"
-                raise ValueError(msg)
+            if (
+                expr._depth != 1 or expr._root_names is None or expr._output_names is None
+            ):  # pragma: no cover
+                msg = "Safety assertion failed, please report a bug to https://github.com/narwhals-dev/narwhals/issues"
+                raise AssertionError(msg)
 
             function_name = remove_prefix(expr._function_name, "col->")
             function_name = POLARS_TO_PANDAS_AGGREGATIONS.get(