From 9c2817df55846040ee0bc4cb9e81db4264e2d367 Mon Sep 17 00:00:00 2001
From: Marco Gorelli <33491632+MarcoGorelli@users.noreply.github.com>
Date: Wed, 13 Nov 2024 10:38:59 +0000
Subject: [PATCH 1/2] wip try using fastpath always

---
 narwhals/_pandas_like/dataframe.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/narwhals/_pandas_like/dataframe.py b/narwhals/_pandas_like/dataframe.py
index 25a5c236f5..c5607bf46 100644
--- a/narwhals/_pandas_like/dataframe.py
+++ b/narwhals/_pandas_like/dataframe.py
@@ -419,6 +419,7 @@ def with_columns(
         fast_path = all(isinstance(x, PandasLikeExpr) for x in exprs) and all(
             isinstance(x, PandasLikeExpr) for (_, x) in named_exprs.items()
         )
+        fast_path = True
 
         if fast_path:
             new_column_name_to_new_column_map = {s.name: s for s in new_columns}

From 212be7791217e484b9a92ff610353dcec80efb8e Mon Sep 17 00:00:00 2001
From: Marco Gorelli <33491632+MarcoGorelli@users.noreply.github.com>
Date: Wed, 13 Nov 2024 10:44:10 +0000
Subject: [PATCH 2/2] simplify

---
 narwhals/_pandas_like/dataframe.py | 60 ++++++++++--------------------
 1 file changed, 20 insertions(+), 40 deletions(-)

diff --git a/narwhals/_pandas_like/dataframe.py b/narwhals/_pandas_like/dataframe.py
index c5607bf46..e55e1524c 100644
--- a/narwhals/_pandas_like/dataframe.py
+++ b/narwhals/_pandas_like/dataframe.py
@@ -9,7 +9,6 @@
 from typing import overload
 
 from narwhals._expression_parsing import evaluate_into_exprs
-from narwhals._pandas_like.expr import PandasLikeExpr
 from narwhals._pandas_like.utils import broadcast_series
 from narwhals._pandas_like.utils import convert_str_slice_to_int_slice
 from narwhals._pandas_like.utils import create_compliant_series
@@ -411,47 +410,28 @@ def with_columns(
         if not new_columns and len(self) == 0:
             return self
 
-        # If the inputs are all Expressions
-        # (as opposed to Series), we can use a fast path (concat, instead of assign).
-        # We can't use the fastpath if any input is not an expression (e.g.
-        # if it's a Series) because then we might be changing its flags.
-        # See `test_memmap` for an example of where this is necessary.
-        fast_path = all(isinstance(x, PandasLikeExpr) for x in exprs) and all(
-            isinstance(x, PandasLikeExpr) for (_, x) in named_exprs.items()
-        )
-        fast_path = True
-
-        if fast_path:
-            new_column_name_to_new_column_map = {s.name: s for s in new_columns}
-            to_concat = []
-            # Make sure to preserve column order
-            for name in self._native_frame.columns:
-                if name in new_column_name_to_new_column_map:
-                    to_concat.append(
-                        validate_dataframe_comparand(
-                            index, new_column_name_to_new_column_map.pop(name)
-                        )
+        new_column_name_to_new_column_map = {s.name: s for s in new_columns}
+        to_concat = []
+        # Make sure to preserve column order
+        for name in self._native_frame.columns:
+            if name in new_column_name_to_new_column_map:
+                to_concat.append(
+                    validate_dataframe_comparand(
+                        index, new_column_name_to_new_column_map.pop(name)
                     )
-                else:
-                    to_concat.append(self._native_frame[name])
-            to_concat.extend(
-                validate_dataframe_comparand(index, new_column_name_to_new_column_map[s])
-                for s in new_column_name_to_new_column_map
-            )
-
-            df = horizontal_concat(
-                to_concat,
-                implementation=self._implementation,
-                backend_version=self._backend_version,
-            )
-        else:
-            # This is the logic in pandas' DataFrame.assign
-            if self._backend_version < (2,):
-                df = self._native_frame.copy(deep=True)
+                )
             else:
-                df = self._native_frame.copy(deep=False)
-            for s in new_columns:
-                df[s.name] = validate_dataframe_comparand(index, s)
+                to_concat.append(self._native_frame[name])
+        to_concat.extend(
+            validate_dataframe_comparand(index, new_column_name_to_new_column_map[s])
+            for s in new_column_name_to_new_column_map
+        )
+
+        df = horizontal_concat(
+            to_concat,
+            implementation=self._implementation,
+            backend_version=self._backend_version,
+        )
         return self._from_native_frame(df)
 
     def rename(self, mapping: dict[str, str]) -> Self: